From bbec11c6d581242090519f99b3d1d183028797dc Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:51:16 +0300 Subject: [PATCH 01/87] chore: Update plugin `source-gitlab` version to v4.1.5 (#13071) Updates the `source-gitlab` plugin latest version to v4.1.5 --- website/versions/source-gitlab.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gitlab.json b/website/versions/source-gitlab.json index ed135a3c11d6c0..38e7177ad9f875 100644 --- a/website/versions/source-gitlab.json +++ b/website/versions/source-gitlab.json @@ -1 +1 @@ -{ "latest": "plugins-source-gitlab-v4.1.4" } +{ "latest": "plugins-source-gitlab-v4.1.5" } From 79e0ca83f4ab6c3632ee56d7765fc36e2b929b71 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:57:57 +0300 Subject: [PATCH 02/87] chore: Update plugin `source-homebrew` version to v3.0.5 (#13074) Updates the `source-homebrew` plugin latest version to v3.0.5 --- website/versions/source-homebrew.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-homebrew.json b/website/versions/source-homebrew.json index 24392ea3c36a13..fab954fb951e79 100644 --- a/website/versions/source-homebrew.json +++ b/website/versions/source-homebrew.json @@ -1 +1 @@ -{ "latest": "plugins-source-homebrew-v3.0.4" } +{ "latest": "plugins-source-homebrew-v3.0.5" } From 546d95cde8c2d8a01ea2b6e3fa76731eae15f24b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:02:28 +0300 Subject: [PATCH 03/87] chore: Update plugin `source-mysql` version to v2.0.4 (#13077) Updates the `source-mysql` plugin latest version to v2.0.4 --- website/versions/source-mysql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-mysql.json b/website/versions/source-mysql.json index c210f8a73d7349..e693108564c0a1 100644 --- a/website/versions/source-mysql.json +++ b/website/versions/source-mysql.json @@ -1 +1 @@ -{ "latest": "plugins-source-mysql-v2.0.3" } +{ "latest": "plugins-source-mysql-v2.0.4" } From a82e94f160cfd3d4b1d7c238bb4ae6602d96ba15 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:06:44 +0300 Subject: [PATCH 04/87] chore: Update plugin `source-okta` version to v3.2.5 (#13078) Updates the `source-okta` plugin latest version to v3.2.5 --- website/versions/source-okta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-okta.json b/website/versions/source-okta.json index 4f1062e486318b..897a9d16bdb402 100644 --- a/website/versions/source-okta.json +++ b/website/versions/source-okta.json @@ -1 +1 @@ -{ "latest": "plugins-source-okta-v3.2.4" } +{ "latest": "plugins-source-okta-v3.2.5" } From 128bb910dc5cd1c39afc0ff51e0e4a7c92a78886 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:11:00 +0300 Subject: [PATCH 05/87] chore: Update plugin `source-oracle` version to v4.0.5 (#13079) Updates the `source-oracle` plugin latest version to v4.0.5 --- website/versions/source-oracle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-oracle.json b/website/versions/source-oracle.json index 1ba45c1fda25ac..a36c3d7186364d 100644 --- a/website/versions/source-oracle.json +++ b/website/versions/source-oracle.json @@ -1 +1 @@ -{ "latest": "plugins-source-oracle-v4.0.4" } +{ "latest": "plugins-source-oracle-v4.0.5" } From 8c03d9ea469b6ef284dcbededac372c8af972299 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Tue, 15 Aug 2023 16:17:01 +0300 Subject: [PATCH 06/87] fix: Handle differences in `format_type` implementation between PostgreSQL & CockroachDB (#13112) Copied the logic from #12975 for data types --- .../source/postgresql/client/list_tables.go | 11 +- plugins/source/postgresql/client/types.go | 2 +- plugins/source/postgresql/pgarrow/to_arrow.go | 73 ++++++++- .../postgresql/pgarrow/to_arrow_test.go | 138 +++++++++++++++++- plugins/source/postgresql/pgarrow/to_pg.go | 60 +++++++- 5 files changed, 273 insertions(+), 11 deletions(-) diff --git a/plugins/source/postgresql/client/list_tables.go b/plugins/source/postgresql/client/list_tables.go index f9c9735397d6fa..b3fa0a172721b9 100644 --- a/plugins/source/postgresql/client/list_tables.go +++ b/plugins/source/postgresql/client/list_tables.go @@ -21,7 +21,14 @@ SELECT columns.ordinal_position AS ordinal_position, pg_class.relname AS table_name, pg_attribute.attname AS column_name, - pg_catalog.format_type(pg_attribute.atttypid, pg_attribute.atttypmod) AS data_type, + CASE + -- This is required per the differences in pg_catalog.format_type implementations + -- between PostgreSQL & CockroachDB. + -- namely, numeric(20,0)[] is returned as numeric[] unless we use the typelem format + [] + WHEN pg_type.typcategory = 'A' AND pg_type.typelem != 0 + THEN pg_catalog.format_type(pg_type.typelem, pg_attribute.atttypmod) || '[]' + ELSE pg_catalog.format_type(pg_attribute.atttypid, pg_attribute.atttypmod) + END AS data_type, CASE WHEN conkey IS NOT NULL AND contype = 'p' AND array_position(conkey, pg_attribute.attnum) > 0 THEN true ELSE false @@ -38,6 +45,8 @@ SELECT FROM pg_catalog.pg_attribute INNER JOIN + pg_catalog.pg_type ON pg_type.oid = pg_attribute.atttypid + INNER JOIN pg_catalog.pg_class ON pg_class.oid = pg_attribute.attrelid INNER JOIN pg_catalog.pg_namespace ON pg_namespace.oid = pg_class.relnamespace diff --git a/plugins/source/postgresql/client/types.go b/plugins/source/postgresql/client/types.go index 8b943e5708cd8b..5782b121e0155e 100644 --- a/plugins/source/postgresql/client/types.go +++ b/plugins/source/postgresql/client/types.go @@ -17,7 +17,7 @@ func (c *Client) SchemaTypeToPg(t arrow.DataType) string { func (c *Client) PgToSchemaType(t string) arrow.DataType { switch c.pgType { case pgTypeCockroachDB: - return pgarrow.Pg10ToCockroach(t) + return pgarrow.CockroachToArrow(t) default: return pgarrow.Pg10ToArrow(t) } diff --git a/plugins/source/postgresql/pgarrow/to_arrow.go b/plugins/source/postgresql/pgarrow/to_arrow.go index 59ef423ed76a3a..f396cf9c99c99f 100644 --- a/plugins/source/postgresql/pgarrow/to_arrow.go +++ b/plugins/source/postgresql/pgarrow/to_arrow.go @@ -33,18 +33,22 @@ func Pg10ToArrow(t string) arrow.DataType { switch t { case "boolean": return arrow.FixedWidthTypes.Boolean - case "smallint": - return arrow.PrimitiveTypes.Int16 case "smallserial": return arrow.PrimitiveTypes.Int16 case "serial": return arrow.PrimitiveTypes.Int32 + case "bigserial", "serial8": + return arrow.PrimitiveTypes.Int64 + case "smallint", "int2": + return arrow.PrimitiveTypes.Int16 case "integer", "int", "int4": return arrow.PrimitiveTypes.Int32 case "bigint", "int8": return arrow.PrimitiveTypes.Int64 - case "bigserial", "serial8": - return arrow.PrimitiveTypes.Int64 + case "numeric(20,0)": + // special case. + // TODO: add Decimal128/256 support + return arrow.PrimitiveTypes.Uint64 case "double precision", "float8": return arrow.PrimitiveTypes.Float64 case "real", "float4": @@ -68,8 +72,65 @@ func Pg10ToArrow(t string) arrow.DataType { } } -func Pg10ToCockroach(t string) arrow.DataType { - return Pg10ToArrow(t) +func CockroachToArrow(t string) arrow.DataType { + t = normalize(t) + if strings.HasSuffix(t, "[]") { + return arrow.ListOf(CockroachToArrow(t[:len(t)-2])) + } + + parsers := []func(string) (arrow.DataType, bool){ + parseTimestamp, + parseTime, + } + for _, parser := range parsers { + got, matched := parser(t) + if matched { + return got + } + } + + switch t { + case "boolean": + return arrow.FixedWidthTypes.Boolean + case "serial2", "smallserial": + return arrow.PrimitiveTypes.Int16 + case "serial4": + return arrow.PrimitiveTypes.Int32 + case "serial8", "bigserial", "serial": + return arrow.PrimitiveTypes.Int64 + case "smallint", "int2": + return arrow.PrimitiveTypes.Int16 + case "int4": + return arrow.PrimitiveTypes.Int32 + case "int", "bigint", "int8", "int64", "integer": + // Cockroach has different aliases for ints + return arrow.PrimitiveTypes.Int64 + case "numeric(20,0)": + // special case. + // TODO: add Decimal128/256 support + return arrow.PrimitiveTypes.Uint64 + case "double precision", "float8": + return arrow.PrimitiveTypes.Float64 + case "real", "float4": + return arrow.PrimitiveTypes.Float32 + case "uuid": + return cqtypes.ExtensionTypes.UUID + case "bytea": + return arrow.BinaryTypes.Binary + case "json", "jsonb": + return cqtypes.ExtensionTypes.JSON + case "cidr": + return cqtypes.ExtensionTypes.Inet + case "macaddr", "macaddr8": + // Cockroach lacks MAC type + return arrow.BinaryTypes.String + case "inet": + return cqtypes.ExtensionTypes.Inet + case "date": + return arrow.FixedWidthTypes.Date32 + default: + return arrow.BinaryTypes.String + } } func normalize(t string) string { diff --git a/plugins/source/postgresql/pgarrow/to_arrow_test.go b/plugins/source/postgresql/pgarrow/to_arrow_test.go index d3b35756ce66da..e4a4d1583566df 100644 --- a/plugins/source/postgresql/pgarrow/to_arrow_test.go +++ b/plugins/source/postgresql/pgarrow/to_arrow_test.go @@ -7,7 +7,7 @@ import ( "github.com/cloudquery/plugin-sdk/v4/types" ) -func TestPg10ToSchemaType(t *testing.T) { +func TestPg10ToArrow(t *testing.T) { cases := []struct { pgType string want arrow.DataType @@ -91,6 +91,8 @@ func TestPg10ToSchemaType(t *testing.T) { {"time(4) with time zone", arrow.FixedWidthTypes.Time64us}, {"time(5) with time zone", arrow.FixedWidthTypes.Time64us}, {"time(6) with time zone", arrow.FixedWidthTypes.Time64us}, + // special case for uint64 + {"numeric(20,0)", arrow.PrimitiveTypes.Uint64}, // types that are converted to string for now - more specific support for these types // may be added in the future @@ -139,3 +141,137 @@ func TestPg10ToSchemaType(t *testing.T) { }) } } +func TestCockroachToArrow(t *testing.T) { + cases := []struct { + pgType string + want arrow.DataType + }{ + {"boolean", arrow.FixedWidthTypes.Boolean}, + {"bigint", arrow.PrimitiveTypes.Int64}, + {"double precision", arrow.PrimitiveTypes.Float64}, + {"uuid", types.ExtensionTypes.UUID}, + {"bytea", arrow.BinaryTypes.Binary}, + {"text[]", arrow.ListOf(arrow.BinaryTypes.String)}, + {"json", types.ExtensionTypes.JSON}, + {"jsonb", types.ExtensionTypes.JSON}, + {"uuid[]", arrow.ListOf(types.ExtensionTypes.UUID)}, + {"cidr", types.ExtensionTypes.Inet}, + {"cidr[]", arrow.ListOf(types.ExtensionTypes.Inet)}, + {"inet", types.ExtensionTypes.Inet}, + {"inet[]", arrow.ListOf(types.ExtensionTypes.Inet)}, + {"timestamp", arrow.FixedWidthTypes.Timestamp_us}, + {"text[][]", arrow.ListOf(arrow.ListOf(arrow.BinaryTypes.String))}, + {"varchar(50)", arrow.BinaryTypes.String}, + {"varchar(50)[][]", arrow.ListOf(arrow.ListOf(arrow.BinaryTypes.String))}, + {"character(10)", arrow.BinaryTypes.String}, + {"integer[]", arrow.ListOf(arrow.PrimitiveTypes.Int64)}, + {"timestamp", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp with time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamptz", arrow.FixedWidthTypes.Timestamp_us}, + {"TIMESTAMPTZ USING timestamp(0)", arrow.FixedWidthTypes.Timestamp_s}, + {"TIMESTAMPTZ USING timestamp(3)", arrow.FixedWidthTypes.Timestamp_ms}, + {"TIMESTAMPTZ USING timestamp(6)", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(0)", arrow.FixedWidthTypes.Timestamp_s}, + {"timestamp(1)", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(2)", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(3)", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(4)", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(5)", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(6)", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(0) without time zone", arrow.FixedWidthTypes.Timestamp_s}, + {"timestamp(1) without time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(2) without time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(3) without time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(4) without time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(5) without time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(6) without time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(0) with time zone", arrow.FixedWidthTypes.Timestamp_s}, + {"timestamp(1) with time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(2) with time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(3) with time zone", arrow.FixedWidthTypes.Timestamp_ms}, + {"timestamp(4) with time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(5) with time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"timestamp(6) with time zone", arrow.FixedWidthTypes.Timestamp_us}, + {"date", arrow.FixedWidthTypes.Date32}, + {"date[]", arrow.ListOf(arrow.FixedWidthTypes.Date32)}, + {"time", arrow.FixedWidthTypes.Time64us}, + {"time[]", arrow.ListOf(arrow.FixedWidthTypes.Time64us)}, + {"time with time zone", arrow.FixedWidthTypes.Time64us}, + {"time with time zone[]", arrow.ListOf(arrow.FixedWidthTypes.Time64us)}, + {"time without time zone", arrow.FixedWidthTypes.Time64us}, + {"time without time zone[]", arrow.ListOf(arrow.FixedWidthTypes.Time64us)}, + {"time(0)", arrow.FixedWidthTypes.Time32s}, + {"time(1)", arrow.FixedWidthTypes.Time32ms}, + {"time(2)", arrow.FixedWidthTypes.Time32ms}, + {"time(3)", arrow.FixedWidthTypes.Time32ms}, + {"time(4)", arrow.FixedWidthTypes.Time64us}, + {"time(5)", arrow.FixedWidthTypes.Time64us}, + {"time(6)", arrow.FixedWidthTypes.Time64us}, + {"time(0) without time zone", arrow.FixedWidthTypes.Time32s}, + {"time(1) without time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(2) without time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(3) without time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(4) without time zone", arrow.FixedWidthTypes.Time64us}, + {"time(5) without time zone", arrow.FixedWidthTypes.Time64us}, + {"time(6) without time zone", arrow.FixedWidthTypes.Time64us}, + {"time(0) with time zone", arrow.FixedWidthTypes.Time32s}, + {"time(1) with time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(2) with time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(3) with time zone", arrow.FixedWidthTypes.Time32ms}, + {"time(4) with time zone", arrow.FixedWidthTypes.Time64us}, + {"time(5) with time zone", arrow.FixedWidthTypes.Time64us}, + {"time(6) with time zone", arrow.FixedWidthTypes.Time64us}, + // special case for uint64 + {"numeric(20,0)", arrow.PrimitiveTypes.Uint64}, + + // types that are converted to string for now - more specific support for these types + // may be added in the future + {"macaddr", arrow.BinaryTypes.String}, + {"macaddr8", arrow.BinaryTypes.String}, + {"macaddr[]", arrow.ListOf(arrow.BinaryTypes.String)}, + {"macaddr8[]", arrow.ListOf(arrow.BinaryTypes.String)}, + {"numeric", arrow.BinaryTypes.String}, + {"numeric (1, 0)", arrow.BinaryTypes.String}, + {"numeric (1000, 1000)", arrow.BinaryTypes.String}, + {"interval", arrow.BinaryTypes.String}, + {"interval YEAR", arrow.BinaryTypes.String}, + {"interval YEAR TO MONTH", arrow.BinaryTypes.String}, + {"interval SECOND", arrow.BinaryTypes.String}, + {"interval MINUTE TO SECOND", arrow.BinaryTypes.String}, + {"interval MINUTE TO SECOND (0)", arrow.BinaryTypes.String}, + {"interval MINUTE TO SECOND (3)", arrow.BinaryTypes.String}, + {"interval SECOND (6)", arrow.BinaryTypes.String}, + {"interval HOUR TO MINUTE", arrow.BinaryTypes.String}, + {"interval YEAR", arrow.BinaryTypes.String}, + {"interval MONTH", arrow.BinaryTypes.String}, + {"interval DAY", arrow.BinaryTypes.String}, + {"interval HOUR", arrow.BinaryTypes.String}, + {"interval MINUTE", arrow.BinaryTypes.String}, + {"interval SECOND", arrow.BinaryTypes.String}, + {"interval YEAR TO MONTH", arrow.BinaryTypes.String}, + {"interval DAY TO HOUR", arrow.BinaryTypes.String}, + {"interval DAY TO MINUTE", arrow.BinaryTypes.String}, + {"interval DAY TO SECOND", arrow.BinaryTypes.String}, + {"interval HOUR TO MINUTE", arrow.BinaryTypes.String}, + {"interval HOUR TO SECOND", arrow.BinaryTypes.String}, + {"interval MINUTE TO SECOND", arrow.BinaryTypes.String}, + {"money", arrow.BinaryTypes.String}, + {"box", arrow.BinaryTypes.String}, + {"bit", arrow.BinaryTypes.String}, + {"bit varying(10)", arrow.BinaryTypes.String}, + {"circle", arrow.BinaryTypes.String}, + {"line", arrow.BinaryTypes.String}, + {"point", arrow.BinaryTypes.String}, + {"path", arrow.BinaryTypes.String}, + {"polygon", arrow.BinaryTypes.String}, + } + + for _, c := range cases { + t.Run(c.pgType, func(t *testing.T) { + got := CockroachToArrow(c.pgType) + if !arrow.TypeEqual(got, c.want) { + t.Errorf("CockroachToArrow(%q) = %v, want %v", c.pgType, got, c.want) + } + }) + } +} diff --git a/plugins/source/postgresql/pgarrow/to_pg.go b/plugins/source/postgresql/pgarrow/to_pg.go index 109dda908a810d..24cbbaf4b0f9e6 100644 --- a/plugins/source/postgresql/pgarrow/to_pg.go +++ b/plugins/source/postgresql/pgarrow/to_pg.go @@ -53,13 +53,69 @@ func ArrowToPg10(t arrow.DataType) string { return "text" case *arrow.BinaryType: return "bytea" + case *arrow.LargeBinaryType: + return "bytea" case *arrow.TimestampType: return "timestamp without time zone" default: - panic("unknown type " + t.String()) + return "text" } } +// ArrowToCockroach converts arrow data type to cockroach data type. CockroachDB lacks support for +// some data types like macaddr and has different aliases for ints. +// See: https://www.cockroachlabs.com/docs/stable/int.html func ArrowToCockroach(t arrow.DataType) string { - return ArrowToPg10(t) + switch dt := t.(type) { + case *cqtypes.UUIDType: + return "uuid" + case *cqtypes.JSONType: + return "jsonb" + case *cqtypes.MACType: + return "text" + case *cqtypes.InetType: + return "inet" + case *arrow.ListType: + return ArrowToCockroach(dt.Elem()) + "[]" + case *arrow.FixedSizeListType: + return ArrowToCockroach(dt.Elem()) + "[]" + case *arrow.LargeListType: + return ArrowToCockroach(dt.Elem()) + "[]" + case *arrow.MapType: + return "text" + case *arrow.BooleanType: + return "boolean" + case *arrow.Int8Type: + return "int2" + case *arrow.Int16Type: + return "int2" + case *arrow.Int32Type: + return "int8" + case *arrow.Int64Type: + return "int8" + case *arrow.Uint8Type: + return "int2" + case *arrow.Uint16Type: + return "int8" + case *arrow.Uint32Type: + return "int8" + case *arrow.Uint64Type: + return "numeric(20,0)" + case *arrow.Float32Type: + return "real" + case *arrow.Float64Type: + return "double precision" + case arrow.DecimalType: + return "numeric(" + strconv.Itoa(int(dt.GetPrecision())) + "," + strconv.Itoa(int(dt.GetScale())) + ")" + case *arrow.StringType: + return "text" + case *arrow.BinaryType: + return "bytea" + case *arrow.LargeBinaryType: + return "bytea" + case *arrow.TimestampType: + return "timestamp without time zone" + default: + return "text" + } } From e4bf409e674c6c31646281e28b611efc5a4793f6 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:21:33 +0300 Subject: [PATCH 07/87] chore: Update plugin `source-oracledb` version to v3.0.5 (#13080) Updates the `source-oracledb` plugin latest version to v3.0.5 --- website/versions/source-oracledb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-oracledb.json b/website/versions/source-oracledb.json index 16b352adf3ee6f..3c7aeeec1f408d 100644 --- a/website/versions/source-oracledb.json +++ b/website/versions/source-oracledb.json @@ -1 +1 @@ -{ "latest": "plugins-source-oracledb-v3.0.4" } +{ "latest": "plugins-source-oracledb-v3.0.5" } From 38829a6d0faaa1c196e2e7fa2833b4461c2d92ae Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:25:48 +0300 Subject: [PATCH 08/87] chore: Update plugin `source-pagerduty` version to v3.0.5 (#13081) Updates the `source-pagerduty` plugin latest version to v3.0.5 --- website/versions/source-pagerduty.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-pagerduty.json b/website/versions/source-pagerduty.json index 47a652acf19d22..48b12de1d8ef88 100644 --- a/website/versions/source-pagerduty.json +++ b/website/versions/source-pagerduty.json @@ -1 +1 @@ -{ "latest": "plugins-source-pagerduty-v3.0.4" } +{ "latest": "plugins-source-pagerduty-v3.0.5" } From fac07304a9d7c2881873d027876f752bebfc2f09 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:29:57 +0300 Subject: [PATCH 09/87] chore: Update plugin `source-hackernews` version to v3.0.5 (#13073) Updates the `source-hackernews` plugin latest version to v3.0.5 --- website/versions/source-hackernews.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-hackernews.json b/website/versions/source-hackernews.json index 521c36bf16d2c5..de11d75388fad8 100644 --- a/website/versions/source-hackernews.json +++ b/website/versions/source-hackernews.json @@ -1 +1 @@ -{ "latest": "plugins-source-hackernews-v3.0.4" } +{ "latest": "plugins-source-hackernews-v3.0.5" } From ad711eb1034a7b70119ee00138c13ae09a4ec13b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:34:09 +0300 Subject: [PATCH 10/87] chore: Update plugin `source-stripe` version to v2.1.5 (#13086) Updates the `source-stripe` plugin latest version to v2.1.5 --- website/versions/source-stripe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-stripe.json b/website/versions/source-stripe.json index c6b723a5226326..43afe609d0c0ce 100644 --- a/website/versions/source-stripe.json +++ b/website/versions/source-stripe.json @@ -1 +1 @@ -{ "latest": "plugins-source-stripe-v2.1.4" } +{ "latest": "plugins-source-stripe-v2.1.5" } From 4ff03ca36d8ea3f2039033a50c0bc5f270628b3f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:37:30 +0300 Subject: [PATCH 11/87] chore: Update plugin `source-googleanalytics` version to v3.0.5 (#13072) Updates the `source-googleanalytics` plugin latest version to v3.0.5 --- website/versions/source-googleanalytics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-googleanalytics.json b/website/versions/source-googleanalytics.json index eec98e4b1e8e89..3c1c2352cfbf69 100644 --- a/website/versions/source-googleanalytics.json +++ b/website/versions/source-googleanalytics.json @@ -1 +1 @@ -{ "latest": "plugins-source-googleanalytics-v3.0.4" } +{ "latest": "plugins-source-googleanalytics-v3.0.5" } From a4d9f5783218e9693e61e1505f98024c9893a906 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:41:37 +0300 Subject: [PATCH 12/87] chore: Update plugin `source-hubspot` version to v3.0.5 (#13075) Updates the `source-hubspot` plugin latest version to v3.0.5 --- website/versions/source-hubspot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-hubspot.json b/website/versions/source-hubspot.json index db76bceb50df0f..7f745a9785ddb4 100644 --- a/website/versions/source-hubspot.json +++ b/website/versions/source-hubspot.json @@ -1 +1 @@ -{ "latest": "plugins-source-hubspot-v3.0.4" } +{ "latest": "plugins-source-hubspot-v3.0.5" } From 7b33836263e71d28d7567a6ff1b66b3cf927d185 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:45:49 +0300 Subject: [PATCH 13/87] chore: Update plugin `source-github` version to v7.1.3 (#13070) Updates the `source-github` plugin latest version to v7.1.3 --- website/versions/source-github.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-github.json b/website/versions/source-github.json index e7b47f1ad4c79e..f29ce38c63ced5 100644 --- a/website/versions/source-github.json +++ b/website/versions/source-github.json @@ -1 +1 @@ -{ "latest": "plugins-source-github-v7.1.2" } +{ "latest": "plugins-source-github-v7.1.3" } From 144ae7ce87db45345250cc32bae43d3c9d4d64f1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:49:57 +0300 Subject: [PATCH 14/87] chore: Update plugin `source-snyk` version to v3.1.5 (#13085) Updates the `source-snyk` plugin latest version to v3.1.5 --- website/versions/source-snyk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-snyk.json b/website/versions/source-snyk.json index ee67fde8e1637e..8dee02b91626f4 100644 --- a/website/versions/source-snyk.json +++ b/website/versions/source-snyk.json @@ -1 +1 @@ -{ "latest": "plugins-source-snyk-v3.1.4" } +{ "latest": "plugins-source-snyk-v3.1.5" } From 48eecfd4c6086e65fd06ba8358553ede280e139f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:54:08 +0300 Subject: [PATCH 15/87] chore: Update plugin `source-postgresql` version to v2.0.6 (#13082) Updates the `source-postgresql` plugin latest version to v2.0.6 --- website/versions/source-postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-postgresql.json b/website/versions/source-postgresql.json index 45e244eb3383e5..2680c63ca43027 100644 --- a/website/versions/source-postgresql.json +++ b/website/versions/source-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-source-postgresql-v2.0.5" } +{ "latest": "plugins-source-postgresql-v2.0.6" } From ef35c860970a0083dedfd159565231d23b9c315f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:57:38 +0300 Subject: [PATCH 16/87] chore: Update plugin `source-terraform` version to v3.0.5 (#13087) Updates the `source-terraform` plugin latest version to v3.0.5 --- website/versions/source-terraform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-terraform.json b/website/versions/source-terraform.json index b229a168677aa2..3f93fe72dfebdd 100644 --- a/website/versions/source-terraform.json +++ b/website/versions/source-terraform.json @@ -1 +1 @@ -{ "latest": "plugins-source-terraform-v3.0.4" } +{ "latest": "plugins-source-terraform-v3.0.5" } From 492cf8042374be57580d098e0933c9c1585c90a3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:01:56 +0300 Subject: [PATCH 17/87] chore: Update plugin `source-salesforce` version to v3.0.5 (#13083) Updates the `source-salesforce` plugin latest version to v3.0.5 --- website/versions/source-salesforce.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-salesforce.json b/website/versions/source-salesforce.json index 0b3d121e879cb5..bb1eeae4e93972 100644 --- a/website/versions/source-salesforce.json +++ b/website/versions/source-salesforce.json @@ -1 +1 @@ -{ "latest": "plugins-source-salesforce-v3.0.4" } +{ "latest": "plugins-source-salesforce-v3.0.5" } From d59b09c84c6da1fe69adec0f4dea95115bf8d9ff Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:06:07 +0300 Subject: [PATCH 18/87] chore: Update plugin `source-shopify` version to v3.0.5 (#13084) Updates the `source-shopify` plugin latest version to v3.0.5 --- website/versions/source-shopify.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-shopify.json b/website/versions/source-shopify.json index d01d17b98ae0a1..849bce3e38d027 100644 --- a/website/versions/source-shopify.json +++ b/website/versions/source-shopify.json @@ -1 +1 @@ -{ "latest": "plugins-source-shopify-v3.0.4" } +{ "latest": "plugins-source-shopify-v3.0.5" } From feeade85ee9a2574d226ea18863106c254becf74 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:10:17 +0300 Subject: [PATCH 19/87] chore: Update Scaffold version to v2.1.5 (#13089) Updates Scaffold latest version to v2.1.5 --- website/versions/scaffold.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/scaffold.json b/website/versions/scaffold.json index 5c02bcba56acc7..c91bc2ade96d13 100644 --- a/website/versions/scaffold.json +++ b/website/versions/scaffold.json @@ -1 +1 @@ -{ "latest": "scaffold-v2.1.4" } +{ "latest": "scaffold-v2.1.5" } From 1af5ea6478e34c1d8e5c3d27496cd050bdeed521 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:14:28 +0300 Subject: [PATCH 20/87] chore: Update plugin `source-k8s` version to v5.0.5 (#13076) Updates the `source-k8s` plugin latest version to v5.0.5 --- website/versions/source-k8s.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-k8s.json b/website/versions/source-k8s.json index 58bcdb49e293aa..4ddd32d9565ea9 100644 --- a/website/versions/source-k8s.json +++ b/website/versions/source-k8s.json @@ -1 +1 @@ -{ "latest": "plugins-source-k8s-v5.0.4" } +{ "latest": "plugins-source-k8s-v5.0.5" } From 0b21b7c8d66aca694b47a5807284b1025c4e4960 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:23:17 +0300 Subject: [PATCH 21/87] chore: Update plugin `source-test` version to v3.1.0 (#13090) Updates the `source-test` plugin latest version to v3.1.0 --- website/versions/source-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-test.json b/website/versions/source-test.json index e95c0e6685b1da..1b3ececd5ff55a 100644 --- a/website/versions/source-test.json +++ b/website/versions/source-test.json @@ -1 +1 @@ -{ "latest": "plugins-source-test-v3.0.5" } +{ "latest": "plugins-source-test-v3.1.0" } From 09c18c3ad6979e96bf732f49f1f1a090768390ff Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Tue, 15 Aug 2023 17:31:53 +0300 Subject: [PATCH 22/87] feat: Simplify value transformation (#13129) 1. Instead of performing type switch for every row for every column, just remember it once for the value transformation 2. reuse the record builder (per `NewRecord` resetting the record builder for reuse) --- plugins/source/postgresql/client/cdc.go | 12 ++-- plugins/source/postgresql/client/sync.go | 51 ++++------------ plugins/source/postgresql/client/transform.go | 61 +++++++++++++++++++ 3 files changed, 81 insertions(+), 43 deletions(-) create mode 100644 plugins/source/postgresql/client/transform.go diff --git a/plugins/source/postgresql/client/cdc.go b/plugins/source/postgresql/client/cdc.go index 0e2fc15342241b..303bb74a845d21 100644 --- a/plugins/source/postgresql/client/cdc.go +++ b/plugins/source/postgresql/client/cdc.go @@ -288,17 +288,21 @@ func decodeTextColumnData(mi *pgtype.Map, data []byte, dataType uint32) (any, er func (c *Client) resourceFromCDCValues(tableName string, values map[string]any) (message.SyncMessage, error) { table := c.tables.Get(tableName) arrowSchema := table.ToArrowSchema() - rb := array.NewRecordBuilder(memory.DefaultAllocator, arrowSchema) + builder := array.NewRecordBuilder(memory.DefaultAllocator, arrowSchema) + transformers := transformersForSchema(arrowSchema) + for i, col := range table.Columns { - val, err := prepareValueForResourceSet(arrowSchema.Field(i).Type, values[col.Name]) + val, err := transformers[i](values[col.Name]) if err != nil { return nil, err } + s := scalar.NewScalar(arrowSchema.Field(i).Type) if err := s.Set(val); err != nil { return nil, fmt.Errorf("error setting value for column %s: %w", col.Name, err) } - scalar.AppendToBuilder(rb.Field(i), s) + + scalar.AppendToBuilder(builder.Field(i), s) } - return &message.SyncInsert{Record: rb.NewRecord()}, nil + return &message.SyncInsert{Record: builder.NewRecord()}, nil } diff --git a/plugins/source/postgresql/client/sync.go b/plugins/source/postgresql/client/sync.go index d6f2faf2283d2f..b661849258cec1 100644 --- a/plugins/source/postgresql/client/sync.go +++ b/plugins/source/postgresql/client/sync.go @@ -2,7 +2,6 @@ package client import ( "context" - "database/sql/driver" "errors" "fmt" "strings" @@ -108,6 +107,10 @@ func (c *Client) syncTables(ctx context.Context, snapshotName string, filteredTa } func syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- message.SyncMessage) error { + arrowSchema := table.ToArrowSchema() + builder := array.NewRecordBuilder(memory.DefaultAllocator, arrowSchema) + transformers := transformersForSchema(arrowSchema) + colNames := make([]string, 0, len(table.Columns)) for _, col := range table.Columns { colNames = append(colNames, pgx.Identifier{col.Name}.Sanitize()) @@ -118,60 +121,30 @@ func syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- m return err } defer rows.Close() + for rows.Next() { values, err := rows.Values() if err != nil { return err } - arrowSchema := table.ToArrowSchema() - rb := array.NewRecordBuilder(memory.DefaultAllocator, arrowSchema) - for i := range values { - val, err := prepareValueForResourceSet(arrowSchema.Field(i).Type, values[i]) + for i, value := range values { + val, err := transformers[i](value) if err != nil { return err } + s := scalar.NewScalar(arrowSchema.Field(i).Type) if err := s.Set(val); err != nil { return err } - scalar.AppendToBuilder(rb.Field(i), s) - } - res <- &message.SyncInsert{Record: rb.NewRecord()} - } - return nil -} -func prepareValueForResourceSet(dataType arrow.DataType, v any) (any, error) { - switch tp := dataType.(type) { - case *arrow.StringType: - if value, ok := v.(driver.Valuer); ok { - if value == driver.Valuer(nil) { - v = nil - } else { - val, err := value.Value() - if err != nil { - return nil, err - } - if s, ok := val.(string); ok { - v = s - } - } - } - case *arrow.Time32Type: - t, err := v.(pgtype.Time).TimeValue() - if err != nil { - return nil, err + scalar.AppendToBuilder(builder.Field(i), s) } - v = stringForTime(t, tp.Unit) - case *arrow.Time64Type: - t, err := v.(pgtype.Time).TimeValue() - if err != nil { - return nil, err - } - v = stringForTime(t, tp.Unit) + res <- &message.SyncInsert{Record: builder.NewRecord()} // NewRecord resets the builder for reuse } - return v, nil + + return nil } func stringForTime(t pgtype.Time, unit arrow.TimeUnit) string { diff --git a/plugins/source/postgresql/client/transform.go b/plugins/source/postgresql/client/transform.go new file mode 100644 index 00000000000000..3459d0bdf1678b --- /dev/null +++ b/plugins/source/postgresql/client/transform.go @@ -0,0 +1,61 @@ +package client + +import ( + "database/sql/driver" + + "github.com/apache/arrow/go/v13/arrow" + "github.com/jackc/pgx/v5/pgtype" +) + +type transformer func(any) (any, error) + +func transformerForDataType(dt arrow.DataType) transformer { + switch dt := dt.(type) { + case *arrow.StringType: + return func(v any) (any, error) { + if value, ok := v.(driver.Valuer); ok { + if value == driver.Valuer(nil) { + return nil, nil + } + + val, err := value.Value() + if err != nil { + return nil, err + } + + if s, ok := val.(string); ok { + return s, nil + } + } + return v, nil + } + case *arrow.Time32Type: + return func(v any) (any, error) { + t, err := v.(pgtype.Time).TimeValue() + if err != nil { + return nil, err + } + return stringForTime(t, dt.Unit), nil + } + case *arrow.Time64Type: + return func(v any) (any, error) { + t, err := v.(pgtype.Time).TimeValue() + if err != nil { + return nil, err + } + return stringForTime(t, dt.Unit), nil + } + default: + return func(v any) (any, error) { + return v, nil + } + } +} + +func transformersForSchema(schema *arrow.Schema) []transformer { + res := make([]transformer, schema.NumFields()) + for i := range res { + res[i] = transformerForDataType(schema.Field(i).Type) + } + return res +} From b56d267c97d5503641d31cd8f4424171fdf47a55 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Tue, 15 Aug 2023 17:36:19 +0300 Subject: [PATCH 23/87] fix!: Don't mark columns unique if they're part of a composite constraint (#13134) Closes #13131 --- plugins/source/postgresql/client/list_tables.go | 7 ++++++- plugins/source/postgresql/resources/plugin/plugin_test.go | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/source/postgresql/client/list_tables.go b/plugins/source/postgresql/client/list_tables.go index b3fa0a172721b9..7fc9f2807093b3 100644 --- a/plugins/source/postgresql/client/list_tables.go +++ b/plugins/source/postgresql/client/list_tables.go @@ -38,7 +38,12 @@ SELECT ELSE false END AS not_null, CASE - WHEN conkey IS NOT NULL AND (contype = 'p' OR contype = 'u') AND array_position(conkey, pg_attribute.attnum) > 0 THEN true + WHEN + conkey IS NOT NULL + AND (contype = 'p' OR contype = 'u') + AND array_length(conkey, 1) = 1 -- we don't handle composite unique keys + AND array_position(conkey, pg_attribute.attnum) > 0 + THEN true ELSE false END AS is_unique, COALESCE(pg_constraint.conname, '') AS constraint_name diff --git a/plugins/source/postgresql/resources/plugin/plugin_test.go b/plugins/source/postgresql/resources/plugin/plugin_test.go index 698f91e0932851..f89fc55d6499bc 100644 --- a/plugins/source/postgresql/resources/plugin/plugin_test.go +++ b/plugins/source/postgresql/resources/plugin/plugin_test.go @@ -216,7 +216,9 @@ func createTableWithUniqueKeys(ctx context.Context, conn *pgxpool.Pool, tableNam column13 int unique, column14 int unique, column15 int unique, - column16 int + column16 int, + column17 int, + unique(column16, column17) ) ` @@ -584,5 +586,6 @@ func TestMigrate(t *testing.T) { {Name: "column14", Type: &arrow.Int32Type{}, PrimaryKey: false, Unique: true, NotNull: false}, {Name: "column15", Type: &arrow.Int32Type{}, PrimaryKey: false, Unique: true, NotNull: false}, {Name: "column16", Type: &arrow.Int32Type{}, PrimaryKey: false, Unique: false, NotNull: false}, + {Name: "column17", Type: &arrow.Int32Type{}, PrimaryKey: false, Unique: false, NotNull: false}, }, table.Columns) } From dc11c99619beb0e3650edfab93dd9299b96df2c1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:39:36 +0300 Subject: [PATCH 24/87] chore: Update plugin `destination-file` version to v3.4.2 (#13094) Updates the `destination-file` plugin latest version to v3.4.2 --- website/versions/destination-file.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-file.json b/website/versions/destination-file.json index d251a8ab56c133..358e36db48d9fd 100644 --- a/website/versions/destination-file.json +++ b/website/versions/destination-file.json @@ -1 +1 @@ -{ "latest": "plugins-destination-file-v3.4.1" } +{ "latest": "plugins-destination-file-v3.4.2" } From 82797b127f4b5adad285eee1cbb07ee80cbecdba Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:43:50 +0300 Subject: [PATCH 25/87] chore: Update plugin `destination-firehose` version to v2.2.4 (#13096) Updates the `destination-firehose` plugin latest version to v2.2.4 --- website/versions/destination-firehose.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-firehose.json b/website/versions/destination-firehose.json index c0657ceedc2715..1134085cad171b 100644 --- a/website/versions/destination-firehose.json +++ b/website/versions/destination-firehose.json @@ -1 +1 @@ -{ "latest": "plugins-destination-firehose-v2.2.3" } +{ "latest": "plugins-destination-firehose-v2.2.4" } From 4214f46f6a8840578fd7056b76cdbcf13d3f9ee3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:48:03 +0300 Subject: [PATCH 26/87] chore: Update plugin `destination-gcs` version to v3.4.2 (#13098) Updates the `destination-gcs` plugin latest version to v3.4.2 --- website/versions/destination-gcs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-gcs.json b/website/versions/destination-gcs.json index 84031d6de7f4da..e22a8e86175d20 100644 --- a/website/versions/destination-gcs.json +++ b/website/versions/destination-gcs.json @@ -1 +1 @@ -{ "latest": "plugins-destination-gcs-v3.4.1" } +{ "latest": "plugins-destination-gcs-v3.4.2" } From 952311e506eb3a1173a60b854a6366a5c53e6d34 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 17:52:06 +0300 Subject: [PATCH 27/87] chore: Update plugin `destination-duckdb` version to v4.2.3 (#13092) Updates the `destination-duckdb` plugin latest version to v4.2.3 --- website/versions/destination-duckdb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-duckdb.json b/website/versions/destination-duckdb.json index ed389d8092b6f7..6c7e2823bb1c72 100644 --- a/website/versions/destination-duckdb.json +++ b/website/versions/destination-duckdb.json @@ -1 +1 @@ -{ "latest": "plugins-destination-duckdb-v4.2.2" } +{ "latest": "plugins-destination-duckdb-v4.2.3" } From 54f1c21f6daa24cbf279e62e0e16b42e27569f5f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:03:14 +0300 Subject: [PATCH 28/87] chore: Update plugin `destination-kafka` version to v3.2.4 (#13099) Updates the `destination-kafka` plugin latest version to v3.2.4 --- website/versions/destination-kafka.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-kafka.json b/website/versions/destination-kafka.json index ea6dbb225c7c5b..aef12425fca947 100644 --- a/website/versions/destination-kafka.json +++ b/website/versions/destination-kafka.json @@ -1 +1 @@ -{ "latest": "plugins-destination-kafka-v3.2.3" } +{ "latest": "plugins-destination-kafka-v3.2.4" } From 4fa4b7a541fa3c51ac1af46b08bb69cd04571757 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:06:43 +0300 Subject: [PATCH 29/87] chore: Update plugin `destination-elasticsearch` version to v3.0.2 (#13100) Updates the `destination-elasticsearch` plugin latest version to v3.0.2 --- website/versions/destination-elasticsearch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-elasticsearch.json b/website/versions/destination-elasticsearch.json index 495109f0216b5a..a78f1e7b59c9d0 100644 --- a/website/versions/destination-elasticsearch.json +++ b/website/versions/destination-elasticsearch.json @@ -1 +1 @@ -{ "latest": "plugins-destination-elasticsearch-v3.0.1" } +{ "latest": "plugins-destination-elasticsearch-v3.0.2" } From 8f2270436fd7c1e72dbae3b3dc69d4b6ee475c6b Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:11:45 +0300 Subject: [PATCH 30/87] chore: Update plugin `destination-mongodb` version to v2.2.7 (#13101) Updates the `destination-mongodb` plugin latest version to v2.2.7 --- website/versions/destination-mongodb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-mongodb.json b/website/versions/destination-mongodb.json index a43879e79b20f5..32240b36cdf21a 100644 --- a/website/versions/destination-mongodb.json +++ b/website/versions/destination-mongodb.json @@ -1 +1 @@ -{ "latest": "plugins-destination-mongodb-v2.2.6" } +{ "latest": "plugins-destination-mongodb-v2.2.7" } From 8b4630d7573358c7515ad259f21375ba98dfc139 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:16:51 +0300 Subject: [PATCH 31/87] chore: Update plugin `destination-azblob` version to v3.4.2 (#13095) Updates the `destination-azblob` plugin latest version to v3.4.2 --- website/versions/destination-azblob.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-azblob.json b/website/versions/destination-azblob.json index 7a956175c4087c..76a219b97baf40 100644 --- a/website/versions/destination-azblob.json +++ b/website/versions/destination-azblob.json @@ -1 +1 @@ -{ "latest": "plugins-destination-azblob-v3.4.1" } +{ "latest": "plugins-destination-azblob-v3.4.2" } From 29938dda4c79e84dd3634fc387184d33663be03f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:20:57 +0300 Subject: [PATCH 32/87] chore: Update plugin `destination-postgresql` version to v5.0.5 (#13102) Updates the `destination-postgresql` plugin latest version to v5.0.5 --- website/versions/destination-postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-postgresql.json b/website/versions/destination-postgresql.json index 4533200b067aba..20b9b31c1db49f 100644 --- a/website/versions/destination-postgresql.json +++ b/website/versions/destination-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-postgresql-v5.0.4" } +{ "latest": "plugins-destination-postgresql-v5.0.5" } From 4645d5477321c2933f7df981de91423419d063f3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:25:12 +0300 Subject: [PATCH 33/87] chore: Update plugin `destination-meilisearch` version to v2.2.4 (#13105) Updates the `destination-meilisearch` plugin latest version to v2.2.4 --- website/versions/destination-meilisearch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-meilisearch.json b/website/versions/destination-meilisearch.json index 3e3bc4dd607989..79f26da4c4d95a 100644 --- a/website/versions/destination-meilisearch.json +++ b/website/versions/destination-meilisearch.json @@ -1 +1 @@ -{ "latest": "plugins-destination-meilisearch-v2.2.3" } +{ "latest": "plugins-destination-meilisearch-v2.2.4" } From 710f016c78e9a4877472a8ad9494ef4db61b4385 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:32:32 +0300 Subject: [PATCH 34/87] chore: Update plugin `destination-gremlin` version to v2.2.5 (#13104) Updates the `destination-gremlin` plugin latest version to v2.2.5 --- website/versions/destination-gremlin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-gremlin.json b/website/versions/destination-gremlin.json index f8569f0ba2e052..0bd9845dc08ba6 100644 --- a/website/versions/destination-gremlin.json +++ b/website/versions/destination-gremlin.json @@ -1 +1 @@ -{ "latest": "plugins-destination-gremlin-v2.2.4" } +{ "latest": "plugins-destination-gremlin-v2.2.5" } From 57acf3cc8d7a81f40e970b8bfc109adb6825f0d4 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:38:18 +0300 Subject: [PATCH 35/87] chore: Update plugin `destination-snowflake` version to v3.2.0 (#13106) Updates the `destination-snowflake` plugin latest version to v3.2.0 --- website/versions/destination-snowflake.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-snowflake.json b/website/versions/destination-snowflake.json index 2a23cdedc8cf21..f89282b7ce4b65 100644 --- a/website/versions/destination-snowflake.json +++ b/website/versions/destination-snowflake.json @@ -1 +1 @@ -{ "latest": "plugins-destination-snowflake-v3.1.2" } +{ "latest": "plugins-destination-snowflake-v3.2.0" } From 50863463e3cc72eab8fd72311fb3f312b996cb3c Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Tue, 15 Aug 2023 18:47:07 +0300 Subject: [PATCH 36/87] feat: Allow multiple rows in sync tables per sent record (#13137) Closes #13110 --- plugins/source/postgresql/client/client.go | 2 ++ plugins/source/postgresql/client/spec.go | 7 +++++++ plugins/source/postgresql/client/sync.go | 17 ++++++++++++++--- .../destinations/postgresql/overview.mdx | 2 +- .../sources/postgresql/_configuration.mdx | 5 ++++- .../plugins/sources/postgresql/overview.mdx | 12 ++++++++---- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/plugins/source/postgresql/client/client.go b/plugins/source/postgresql/client/client.go index 726cc5df7515be..a43c61059338d3 100644 --- a/plugins/source/postgresql/client/client.go +++ b/plugins/source/postgresql/client/client.go @@ -48,6 +48,8 @@ func Configure(ctx context.Context, logger zerolog.Logger, spec []byte, opts plu if err := json.Unmarshal(spec, &pluginSpec); err != nil { return nil, fmt.Errorf("failed to unmarshal postgresql spec: %w", err) } + pluginSpec.SetDefaults() + c.pluginSpec = pluginSpec logLevel, err := tracelog.LogLevelFromString(pluginSpec.PgxLogLevel.String()) if err != nil { diff --git a/plugins/source/postgresql/client/spec.go b/plugins/source/postgresql/client/spec.go index 3989008fb2690f..8c9e3a5eee67be 100644 --- a/plugins/source/postgresql/client/spec.go +++ b/plugins/source/postgresql/client/spec.go @@ -4,4 +4,11 @@ type Spec struct { ConnectionString string `json:"connection_string,omitempty"` PgxLogLevel LogLevel `json:"pgx_log_level,omitempty"` CDCId string `json:"cdc_id,omitempty"` + RowsPerRecord int `json:"rows_per_record,omitempty"` +} + +func (s *Spec) SetDefaults() { + if s.RowsPerRecord < 1 { + s.RowsPerRecord = 1 + } } diff --git a/plugins/source/postgresql/client/sync.go b/plugins/source/postgresql/client/sync.go index b661849258cec1..b24f9dbf494c59 100644 --- a/plugins/source/postgresql/client/sync.go +++ b/plugins/source/postgresql/client/sync.go @@ -96,7 +96,7 @@ func (c *Client) syncTables(ctx context.Context, snapshotName string, filteredTa } for _, table := range filteredTables { - if err := syncTable(ctx, tx, table, res); err != nil { + if err := c.syncTable(ctx, tx, table, res); err != nil { return err } } @@ -106,7 +106,7 @@ func (c *Client) syncTables(ctx context.Context, snapshotName string, filteredTa return nil } -func syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- message.SyncMessage) error { +func (c *Client) syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- message.SyncMessage) error { arrowSchema := table.ToArrowSchema() builder := array.NewRecordBuilder(memory.DefaultAllocator, arrowSchema) transformers := transformersForSchema(arrowSchema) @@ -122,6 +122,7 @@ func syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- m } defer rows.Close() + rowsInRecord := 0 for rows.Next() { values, err := rows.Values() if err != nil { @@ -141,7 +142,17 @@ func syncTable(ctx context.Context, tx pgx.Tx, table *schema.Table, res chan<- m scalar.AppendToBuilder(builder.Field(i), s) } - res <- &message.SyncInsert{Record: builder.NewRecord()} // NewRecord resets the builder for reuse + + rowsInRecord++ + if rowsInRecord >= c.pluginSpec.RowsPerRecord { + res <- &message.SyncInsert{Record: builder.NewRecord()} // NewRecord resets the builder for reuse + rowsInRecord = 0 + } + } + + record := builder.NewRecord() + if record.NumRows() > 0 { // only send if there are some unsent rows + res <- &message.SyncInsert{Record: record} } return nil diff --git a/website/pages/docs/plugins/destinations/postgresql/overview.mdx b/website/pages/docs/plugins/destinations/postgresql/overview.mdx index b443729d007bda..ac6fb28950edc6 100644 --- a/website/pages/docs/plugins/destinations/postgresql/overview.mdx +++ b/website/pages/docs/plugins/destinations/postgresql/overview.mdx @@ -38,7 +38,7 @@ The PostgreSQL destination utilizes batching, and supports [`batch_size`](/docs/ This is the (nested) spec used by the PostgreSQL destination Plugin. -- `connection_string` (string) (required) +- `connection_string` (`string`) (required) Connection string to connect to the database. This can be a URL or a DSN, as per [`pgxpool`](https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig) diff --git a/website/pages/docs/plugins/sources/postgresql/_configuration.mdx b/website/pages/docs/plugins/sources/postgresql/_configuration.mdx index 3fee2b325cb027..ea6e5b8f829088 100644 --- a/website/pages/docs/plugins/sources/postgresql/_configuration.mdx +++ b/website/pages/docs/plugins/sources/postgresql/_configuration.mdx @@ -9,7 +9,10 @@ spec: destinations: ["DESTINATION_NAME"] spec: connection_string: "postgresql://postgres:pass@localhost:5432/postgres?sslmode=disable" - cdc_id: "postgresql" # Set to a unique string per source to enable Change Data Capture mode (logical replication, or CDC) + # Optional parameters: + # cdc_id: "postgresql" # Set to a unique string per source to enable Change Data Capture mode (logical replication, or CDC) + # pgx_log_level: error + # rows_per_record: 1 ``` This example configures a PostgreSQL source, located at `localhost:5432`. The (top level) spec section is described in the [Source Spec Reference](/docs/reference/source-spec). diff --git a/website/pages/docs/plugins/sources/postgresql/overview.mdx b/website/pages/docs/plugins/sources/postgresql/overview.mdx index d720820e1ab75a..2046c32febb82f 100644 --- a/website/pages/docs/plugins/sources/postgresql/overview.mdx +++ b/website/pages/docs/plugins/sources/postgresql/overview.mdx @@ -44,7 +44,7 @@ Make sure you use environment variable expansion in production instead of commit This is the (nested) spec used by the PostgreSQL source Plugin. -- `connection_string` (string, required) +- `connection_string` (`string`, required) Connection string to connect to the database. This can be a URL or a DSN, as per [`pgxpool`](https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig) @@ -55,16 +55,20 @@ This is the (nested) spec used by the PostgreSQL source Plugin. - `"dbname=mydb"` _unix domain socket, just specifying the db name - useful if you want to use peer authentication_ - `"user=jack password=jack\\'ssooper\\\\secret host=localhost port=5432 dbname=mydb sslmode=disable"` _DSN with escaped backslash and single quote_ -- `pgx_log_level` (string, optional. Default: "error") +- `pgx_log_level` (`string`) (optional) (default: `error`) Available: "error", "warn", "info", "debug", "trace" define if and in which level to log [`pgx`](https://github.com/jackc/pgx) call. -- `cdc_id` (string, optional. Default: "") +- `cdc_id` (`string`) (optional) - If set to a non empty string the source plugin will start syncing CDC via PostgreSQL logical replication in real-time. + If set to a non-empty string the source plugin will start syncing CDC via PostgreSQL logical replication in real-time. The value should be unique across all sources. +- `rows_per_record` (`integer`) (optional) (default: `1`) + + Amount of rows to be packed into a single Apache Arrow record to be sent over the wire during sync (or initial sync in the CDC mode). + We suggest using significantly more than the default (e.g. `5000`) to sync from large databases/tables. ### Verbose logging for debug From 188be0d59cea3f5a1b33b079ee70470d65d736df Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:51:20 +0300 Subject: [PATCH 37/87] chore: Update plugin `destination-sqlite` version to v2.4.6 (#13109) Updates the `destination-sqlite` plugin latest version to v2.4.6 --- website/versions/destination-sqlite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-sqlite.json b/website/versions/destination-sqlite.json index 3bdbc1329ed4b8..41ec26fb93c4ae 100644 --- a/website/versions/destination-sqlite.json +++ b/website/versions/destination-sqlite.json @@ -1 +1 @@ -{ "latest": "plugins-destination-sqlite-v2.4.5" } +{ "latest": "plugins-destination-sqlite-v2.4.6" } From cedcdde6211795889ed879cc2df79e6ade17b5a8 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:55:22 +0300 Subject: [PATCH 38/87] chore(main): Release plugins-source-postgresql v3.0.0 (#13130) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release *beep* *boop* --- ## [3.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-postgresql-v2.0.6...plugins-source-postgresql-v3.0.0) (2023-08-15) ### โš  BREAKING CHANGES * Don't mark columns unique if they're part of a composite constraint ([#13134](https://github.com/cloudquery/cloudquery/issues/13134)) ### Features * Allow multiple rows in sync tables per sent record ([#13137](https://github.com/cloudquery/cloudquery/issues/13137)) ([5086346](https://github.com/cloudquery/cloudquery/commit/50863463e3cc72eab8fd72311fb3f312b996cb3c)), closes [#13110](https://github.com/cloudquery/cloudquery/issues/13110) * Simplify value transformation ([#13129](https://github.com/cloudquery/cloudquery/issues/13129)) ([09c18c3](https://github.com/cloudquery/cloudquery/commit/09c18c3ad6979e96bf732f49f1f1a090768390ff)) ### Bug Fixes * Don't mark columns unique if they're part of a composite constraint ([#13134](https://github.com/cloudquery/cloudquery/issues/13134)) ([b56d267](https://github.com/cloudquery/cloudquery/commit/b56d267c97d5503641d31cd8f4424171fdf47a55)), closes [#13131](https://github.com/cloudquery/cloudquery/issues/13131) * Handle differences in `format_type` implementation between PostgreSQL & CockroachDB ([#13112](https://github.com/cloudquery/cloudquery/issues/13112)) ([8c03d9e](https://github.com/cloudquery/cloudquery/commit/8c03d9ea469b6ef284dcbededac372c8af972299)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- plugins/source/postgresql/CHANGELOG.md | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 62f3031d70172b..a087b1571909d3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -81,7 +81,7 @@ "plugins/destination/elasticsearch+FILLER": "0.0.0", "plugins/destination/clickhouse": "3.3.4", "plugins/destination/clickhouse+FILLER": "0.0.0", - "plugins/source/postgresql": "2.0.6", + "plugins/source/postgresql": "3.0.0", "plugins/source/postgresql+FILLER": "0.0.0", "plugins/source/homebrew": "3.0.5", "plugins/source/homebrew+FILLER": "0.0.0", diff --git a/plugins/source/postgresql/CHANGELOG.md b/plugins/source/postgresql/CHANGELOG.md index 5b5817034e9781..29e8e465d58df0 100644 --- a/plugins/source/postgresql/CHANGELOG.md +++ b/plugins/source/postgresql/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [3.0.0](https://github.com/cloudquery/cloudquery/compare/plugins-source-postgresql-v2.0.6...plugins-source-postgresql-v3.0.0) (2023-08-15) + + +### โš  BREAKING CHANGES + +* Don't mark columns unique if they're part of a composite constraint ([#13134](https://github.com/cloudquery/cloudquery/issues/13134)) + +### Features + +* Allow multiple rows in sync tables per sent record ([#13137](https://github.com/cloudquery/cloudquery/issues/13137)) ([5086346](https://github.com/cloudquery/cloudquery/commit/50863463e3cc72eab8fd72311fb3f312b996cb3c)), closes [#13110](https://github.com/cloudquery/cloudquery/issues/13110) +* Simplify value transformation ([#13129](https://github.com/cloudquery/cloudquery/issues/13129)) ([09c18c3](https://github.com/cloudquery/cloudquery/commit/09c18c3ad6979e96bf732f49f1f1a090768390ff)) + + +### Bug Fixes + +* Don't mark columns unique if they're part of a composite constraint ([#13134](https://github.com/cloudquery/cloudquery/issues/13134)) ([b56d267](https://github.com/cloudquery/cloudquery/commit/b56d267c97d5503641d31cd8f4424171fdf47a55)), closes [#13131](https://github.com/cloudquery/cloudquery/issues/13131) +* Handle differences in `format_type` implementation between PostgreSQL & CockroachDB ([#13112](https://github.com/cloudquery/cloudquery/issues/13112)) ([8c03d9e](https://github.com/cloudquery/cloudquery/commit/8c03d9ea469b6ef284dcbededac372c8af972299)) + ## [2.0.6](https://github.com/cloudquery/cloudquery/compare/plugins-source-postgresql-v2.0.5...plugins-source-postgresql-v2.0.6) (2023-08-15) From 0487318824dbc7b563f2db49b3c20fa8eb5f732e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:59:36 +0300 Subject: [PATCH 39/87] chore: Update plugin `destination-s3` version to v4.6.2 (#13107) Updates the `destination-s3` plugin latest version to v4.6.2 --- website/versions/destination-s3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-s3.json b/website/versions/destination-s3.json index 3be72cd0f0eef1..141eaaaf4d8676 100644 --- a/website/versions/destination-s3.json +++ b/website/versions/destination-s3.json @@ -1 +1 @@ -{ "latest": "plugins-destination-s3-v4.6.1" } +{ "latest": "plugins-destination-s3-v4.6.2" } From 70a22981b800e88224001c5cdb67111a9fb56054 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:04:29 +0300 Subject: [PATCH 40/87] chore: Update plugin `source-alicloud` version to v4.0.5 (#13113) Updates the `source-alicloud` plugin latest version to v4.0.5 --- website/versions/source-alicloud.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-alicloud.json b/website/versions/source-alicloud.json index 21906cf8b04db3..faef50d2ad9977 100644 --- a/website/versions/source-alicloud.json +++ b/website/versions/source-alicloud.json @@ -1 +1 @@ -{ "latest": "plugins-source-alicloud-v4.0.4" } +{ "latest": "plugins-source-alicloud-v4.0.5" } From 4748be44a3015fe1e7f24f2fe5b8bc8485da7743 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:08:45 +0300 Subject: [PATCH 41/87] chore: Update plugin `source-postgresql` version to v3.0.0 (#13138) Updates the `source-postgresql` plugin latest version to v3.0.0 --- website/versions/source-postgresql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-postgresql.json b/website/versions/source-postgresql.json index 2680c63ca43027..782fbeb3720878 100644 --- a/website/versions/source-postgresql.json +++ b/website/versions/source-postgresql.json @@ -1 +1 @@ -{ "latest": "plugins-source-postgresql-v2.0.6" } +{ "latest": "plugins-source-postgresql-v3.0.0" } From 265963d195a781382b2cebddbaa2cae5d47a948f Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:12:59 +0300 Subject: [PATCH 42/87] chore: Update plugin `destination-test` version to v2.2.4 (#13111) Updates the `destination-test` plugin latest version to v2.2.4 --- website/versions/destination-test.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-test.json b/website/versions/destination-test.json index 405a70f2fba516..bc490708ad9312 100644 --- a/website/versions/destination-test.json +++ b/website/versions/destination-test.json @@ -1 +1 @@ -{ "latest": "plugins-destination-test-v2.2.3" } +{ "latest": "plugins-destination-test-v2.2.4" } From 633c2c18a2c1b5bead70c31b76c98271af8ef73e Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:20:35 +0300 Subject: [PATCH 43/87] chore: Update plugin `destination-mysql` version to v3.0.3 (#13114) Updates the `destination-mysql` plugin latest version to v3.0.3 --- website/versions/destination-mysql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-mysql.json b/website/versions/destination-mysql.json index ea4ac87bbd6883..ea54ce0fe41cfb 100644 --- a/website/versions/destination-mysql.json +++ b/website/versions/destination-mysql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-mysql-v3.0.2" } +{ "latest": "plugins-destination-mysql-v3.0.3" } From 919f115195066fc1b1b14110d7503530586d7a0c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:24:41 +0300 Subject: [PATCH 44/87] chore: Update plugin `source-azuredevops` version to v3.0.5 (#13117) Updates the `source-azuredevops` plugin latest version to v3.0.5 --- website/versions/source-azuredevops.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-azuredevops.json b/website/versions/source-azuredevops.json index 38965059b57a82..897d75c8e43641 100644 --- a/website/versions/source-azuredevops.json +++ b/website/versions/source-azuredevops.json @@ -1 +1 @@ -{ "latest": "plugins-source-azuredevops-v3.0.4" } +{ "latest": "plugins-source-azuredevops-v3.0.5" } From f8f60d1f0fb30644703ae7f4a0e315f9e5fe24bd Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:38:09 +0300 Subject: [PATCH 45/87] chore(deps): Update CloudQuery monorepo modules (#13118) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Update | Change | |---|---|---| | [destination-postgresql](https://togithub.com/cloudquery/cloudquery) | patch | `v5.0.4` -> `v5.0.5` | | [destination-sqlite](https://togithub.com/cloudquery/cloudquery) | patch | `v2.4.5` -> `v2.4.6` | | [destination-test](https://togithub.com/cloudquery/cloudquery) | patch | `v2.2.3` -> `v2.2.4` | | [source-test](https://togithub.com/cloudquery/cloudquery) | minor | `v3.0.5` -> `v3.1.0` | --- ### โš  Dependency Lookup Warnings โš  Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes
cloudquery/cloudquery (destination-postgresql) ### [`v5.0.5`](https://togithub.com/cloudquery/cloudquery/releases/tag/plugins-destination-postgresql-v5.0.5) [Compare Source](https://togithub.com/cloudquery/cloudquery/compare/plugins-source-cloudflare-v5.0.4...plugins-source-cloudflare-v5.0.5) ##### Bug Fixes - **deps:** Update github.com/cloudquery/arrow/go/v13 digest to [`e9683e1`](https://togithub.com/cloudquery/cloudquery/commit/e9683e1) ([#​13015](https://togithub.com/cloudquery/cloudquery/issues/13015)) ([6557696](https://togithub.com/cloudquery/cloudquery/commit/65576966d3bd14297499a5b85d3b4fc2c7918df3)) - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.4.0 ([#​12850](https://togithub.com/cloudquery/cloudquery/issues/12850)) ([0861200](https://togithub.com/cloudquery/cloudquery/commit/086120054b45213947e95be954ba6164b9cf6587)) - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.5.0 ([#​13068](https://togithub.com/cloudquery/cloudquery/issues/13068)) ([7bb0e4b](https://togithub.com/cloudquery/cloudquery/commit/7bb0e4ba654971726e16a6a501393e3831170307)) - Normalization logic for new & existing tables differences ([#​12975](https://togithub.com/cloudquery/cloudquery/issues/12975)) ([f2d6b27](https://togithub.com/cloudquery/cloudquery/commit/f2d6b27dad78551fcc7ad18d58e83761c3c24d25))
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ‘ป **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/cmd/testdata/multiple-destinations.yml | 2 +- cli/cmd/testdata/multiple-sources-destinations.yml | 8 ++++---- cli/cmd/testdata/multiple-sources.yml | 6 +++--- cli/cmd/testdata/sync-missing-path-error.yml | 4 ++-- plugins/source/aws/test/policy_cq_config.yml | 2 +- plugins/source/aws/test/sanity.yml | 2 +- plugins/source/azure/test/policy_cq_config.yml | 2 +- plugins/source/gcp/test/policy_cq_config.yml | 2 +- plugins/source/k8s/test/policy_cq_config.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/cmd/testdata/multiple-destinations.yml b/cli/cmd/testdata/multiple-destinations.yml index f20b281990d414..38c2b360efbb1c 100644 --- a/cli/cmd/testdata/multiple-destinations.yml +++ b/cli/cmd/testdata/multiple-destinations.yml @@ -16,4 +16,4 @@ kind: "destination" spec: name: "test2" path: "cloudquery/test" - version: "v2.2.3" # latest version of destination test plugin \ No newline at end of file + version: "v2.2.4" # latest version of destination test plugin \ No newline at end of file diff --git a/cli/cmd/testdata/multiple-sources-destinations.yml b/cli/cmd/testdata/multiple-sources-destinations.yml index abd2caf8ca414b..36f5d7d4cf1c41 100644 --- a/cli/cmd/testdata/multiple-sources-destinations.yml +++ b/cli/cmd/testdata/multiple-sources-destinations.yml @@ -3,7 +3,7 @@ spec: name: "test-1" path: "cloudquery/test" destinations: [test-1] - version: "v3.0.5" # latest version of source test plugin + version: "v3.1.0" # latest version of source test plugin tables: ["*"] --- kind: "source" @@ -11,17 +11,17 @@ spec: name: "test-2" path: "cloudquery/test" destinations: [test-2] - version: "v3.0.5" # latest version of source test plugin + version: "v3.1.0" # latest version of source test plugin tables: ["*"] --- kind: "destination" spec: name: "test-1" path: "cloudquery/test" - version: "v2.2.3" # latest version of destination test plugin + version: "v2.2.4" # latest version of destination test plugin --- kind: "destination" spec: name: "test-2" path: "cloudquery/test" - version: "v2.2.3" # latest version of destination test plugin + version: "v2.2.4" # latest version of destination test plugin diff --git a/cli/cmd/testdata/multiple-sources.yml b/cli/cmd/testdata/multiple-sources.yml index 50f42af886ca0c..e93eaae61aa753 100644 --- a/cli/cmd/testdata/multiple-sources.yml +++ b/cli/cmd/testdata/multiple-sources.yml @@ -3,7 +3,7 @@ spec: name: "test" path: "cloudquery/test" destinations: [test] - version: "v3.0.5" # latest version of source test plugin + version: "v3.1.0" # latest version of source test plugin tables: ["*"] --- kind: "source" @@ -11,11 +11,11 @@ spec: name: "test2" path: "cloudquery/test" destinations: [test] - version: "v3.0.5" # latest version of source test plugin + version: "v3.1.0" # latest version of source test plugin tables: ["*"] --- kind: "destination" spec: name: "test" path: "cloudquery/test" - version: "v2.2.3" # latest version of destination test plugin \ No newline at end of file + version: "v2.2.4" # latest version of destination test plugin \ No newline at end of file diff --git a/cli/cmd/testdata/sync-missing-path-error.yml b/cli/cmd/testdata/sync-missing-path-error.yml index 1e499de5ebf1b5..2910bec81e32ca 100644 --- a/cli/cmd/testdata/sync-missing-path-error.yml +++ b/cli/cmd/testdata/sync-missing-path-error.yml @@ -3,10 +3,10 @@ spec: name: "test" path: "cloudquery/test" destinations: [test] - version: "v3.0.5" # latest version of source test plugin + version: "v3.1.0" # latest version of source test plugin tables: ["*"] --- kind: "destination" spec: name: "test" - version: "v2.2.3" # latest version of destination test plugin + version: "v2.2.4" # latest version of destination test plugin diff --git a/plugins/source/aws/test/policy_cq_config.yml b/plugins/source/aws/test/policy_cq_config.yml index 49b81d67f61838..f8443e3afde5e7 100644 --- a/plugins/source/aws/test/policy_cq_config.yml +++ b/plugins/source/aws/test/policy_cq_config.yml @@ -11,6 +11,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v5.0.4" # latest version of postgresql plugin + version: "v5.0.5" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/aws/test/sanity.yml b/plugins/source/aws/test/sanity.yml index a95a97b8b14251..1b421a04447a6d 100644 --- a/plugins/source/aws/test/sanity.yml +++ b/plugins/source/aws/test/sanity.yml @@ -14,4 +14,4 @@ kind: destination spec: name: sqlite path: cloudquery/sqlite - version: "v2.4.5" # latest version of sqlite plugin \ No newline at end of file + version: "v2.4.6" # latest version of sqlite plugin \ No newline at end of file diff --git a/plugins/source/azure/test/policy_cq_config.yml b/plugins/source/azure/test/policy_cq_config.yml index 1cb83f76318c01..cde75e10c375fa 100644 --- a/plugins/source/azure/test/policy_cq_config.yml +++ b/plugins/source/azure/test/policy_cq_config.yml @@ -11,6 +11,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v5.0.4" # latest version of postgresql plugin + version: "v5.0.5" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/gcp/test/policy_cq_config.yml b/plugins/source/gcp/test/policy_cq_config.yml index 274262ce9bf1d2..9e53cc2055346b 100644 --- a/plugins/source/gcp/test/policy_cq_config.yml +++ b/plugins/source/gcp/test/policy_cq_config.yml @@ -11,6 +11,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v5.0.4" # latest version of postgresql plugin + version: "v5.0.5" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file diff --git a/plugins/source/k8s/test/policy_cq_config.yml b/plugins/source/k8s/test/policy_cq_config.yml index 12f68b38a97377..01342ba826d4d3 100644 --- a/plugins/source/k8s/test/policy_cq_config.yml +++ b/plugins/source/k8s/test/policy_cq_config.yml @@ -11,6 +11,6 @@ kind: destination spec: name: postgresql path: cloudquery/postgresql - version: "v5.0.4" # latest version of postgresql plugin + version: "v5.0.5" # latest version of postgresql plugin spec: connection_string: ${CQ_DSN} \ No newline at end of file From 36161ec8c7d3989fa46e228f399a589e02c73f71 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:42:17 +0300 Subject: [PATCH 46/87] chore: Update plugin `destination-neo4j` version to v4.0.5 (#13115) Updates the `destination-neo4j` plugin latest version to v4.0.5 --- website/versions/destination-neo4j.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-neo4j.json b/website/versions/destination-neo4j.json index 37179968e30269..f16370cc89a03e 100644 --- a/website/versions/destination-neo4j.json +++ b/website/versions/destination-neo4j.json @@ -1 +1 @@ -{ "latest": "plugins-destination-neo4j-v4.0.4" } +{ "latest": "plugins-destination-neo4j-v4.0.5" } From 3c742f09cbadbfcb26e63859b0675076975af8ea Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:46:26 +0300 Subject: [PATCH 47/87] chore: Update plugin `source-datadog` version to v3.1.6 (#13116) Updates the `source-datadog` plugin latest version to v3.1.6 --- website/versions/source-datadog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-datadog.json b/website/versions/source-datadog.json index 0a97f5f19ce055..10b7e0b7bcae6f 100644 --- a/website/versions/source-datadog.json +++ b/website/versions/source-datadog.json @@ -1 +1 @@ -{ "latest": "plugins-source-datadog-v3.1.5" } +{ "latest": "plugins-source-datadog-v3.1.6" } From 5003c2e168df3485873d299a4caad07ac9a60d2d Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:51:39 +0300 Subject: [PATCH 48/87] chore: Update plugin `source-facebookmarketing` version to v3.0.5 (#13121) Updates the `source-facebookmarketing` plugin latest version to v3.0.5 --- website/versions/source-facebookmarketing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-facebookmarketing.json b/website/versions/source-facebookmarketing.json index 41fe2dee0bd785..c3c46c961ce7f7 100644 --- a/website/versions/source-facebookmarketing.json +++ b/website/versions/source-facebookmarketing.json @@ -1 +1 @@ -{ "latest": "plugins-source-facebookmarketing-v3.0.4" } +{ "latest": "plugins-source-facebookmarketing-v3.0.5" } From 703b9bf8f3c23d7ed0ebff98f2f160721c00213b Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Tue, 15 Aug 2023 11:56:08 -0500 Subject: [PATCH 49/87] chore: Remove Hard Coded repo name (#13057) #### Summary If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- plugins/destination/azblob/go.mod | 2 +- plugins/destination/azblob/go.sum | 4 ++-- plugins/destination/file/go.mod | 2 +- plugins/destination/file/go.sum | 4 ++-- plugins/destination/gcs/go.mod | 2 +- plugins/destination/gcs/go.sum | 4 ++-- plugins/destination/kafka/go.mod | 2 +- plugins/destination/kafka/go.sum | 4 ++-- plugins/destination/s3/go.mod | 2 +- plugins/destination/s3/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/destination/azblob/go.mod b/plugins/destination/azblob/go.mod index 3b1cf6c79184a9..ca1fa96cc5ab1f 100644 --- a/plugins/destination/azblob/go.mod +++ b/plugins/destination/azblob/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.2 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 - github.com/cloudquery/filetypes/v4 v4.1.2 + github.com/cloudquery/filetypes/v4 v4.1.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.3.0 diff --git a/plugins/destination/azblob/go.sum b/plugins/destination/azblob/go.sum index f028fba4159990..07884d4d269203 100644 --- a/plugins/destination/azblob/go.sum +++ b/plugins/destination/azblob/go.sum @@ -63,8 +63,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/filetypes/v4 v4.1.2 h1:u4/2BvqbwxtAEo619VSaf90uxkPEfTzrMM67sYmrweg= -github.com/cloudquery/filetypes/v4 v4.1.2/go.mod h1:zi8i4KklbZWqfPa0mCmKJN3tELvLJcI6UudZtrPAHtc= +github.com/cloudquery/filetypes/v4 v4.1.3 h1:Yd+cUv3aDdhQSum1wUqxFbxzyk+LjcA0XA9bWWhncCc= +github.com/cloudquery/filetypes/v4 v4.1.3/go.mod h1:iiy/HFRlfRSWr/AQ2CgqxQTsY0gJKxpk+xzxZttoCsQ= github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/file/go.mod b/plugins/destination/file/go.mod index 4719b9b2844dda..d36236ef0c2a58 100644 --- a/plugins/destination/file/go.mod +++ b/plugins/destination/file/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 - github.com/cloudquery/filetypes/v4 v4.1.2 + github.com/cloudquery/filetypes/v4 v4.1.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.3.0 diff --git a/plugins/destination/file/go.sum b/plugins/destination/file/go.sum index 1bbe25ea816acc..87ba6f81cc3825 100644 --- a/plugins/destination/file/go.sum +++ b/plugins/destination/file/go.sum @@ -53,8 +53,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/filetypes/v4 v4.1.2 h1:u4/2BvqbwxtAEo619VSaf90uxkPEfTzrMM67sYmrweg= -github.com/cloudquery/filetypes/v4 v4.1.2/go.mod h1:zi8i4KklbZWqfPa0mCmKJN3tELvLJcI6UudZtrPAHtc= +github.com/cloudquery/filetypes/v4 v4.1.3 h1:Yd+cUv3aDdhQSum1wUqxFbxzyk+LjcA0XA9bWWhncCc= +github.com/cloudquery/filetypes/v4 v4.1.3/go.mod h1:iiy/HFRlfRSWr/AQ2CgqxQTsY0gJKxpk+xzxZttoCsQ= github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/gcs/go.mod b/plugins/destination/gcs/go.mod index 7504299a72df66..ccc9d62f564db2 100644 --- a/plugins/destination/gcs/go.mod +++ b/plugins/destination/gcs/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cloud.google.com/go/storage v1.30.1 github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 - github.com/cloudquery/filetypes/v4 v4.1.2 + github.com/cloudquery/filetypes/v4 v4.1.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/google/uuid v1.3.0 github.com/rs/zerolog v1.30.0 diff --git a/plugins/destination/gcs/go.sum b/plugins/destination/gcs/go.sum index 7f27766a62be67..b1c4bab1fdd792 100644 --- a/plugins/destination/gcs/go.sum +++ b/plugins/destination/gcs/go.sum @@ -63,8 +63,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/filetypes/v4 v4.1.2 h1:u4/2BvqbwxtAEo619VSaf90uxkPEfTzrMM67sYmrweg= -github.com/cloudquery/filetypes/v4 v4.1.2/go.mod h1:zi8i4KklbZWqfPa0mCmKJN3tELvLJcI6UudZtrPAHtc= +github.com/cloudquery/filetypes/v4 v4.1.3 h1:Yd+cUv3aDdhQSum1wUqxFbxzyk+LjcA0XA9bWWhncCc= +github.com/cloudquery/filetypes/v4 v4.1.3/go.mod h1:iiy/HFRlfRSWr/AQ2CgqxQTsY0gJKxpk+xzxZttoCsQ= github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/kafka/go.mod b/plugins/destination/kafka/go.mod index 9e9991b4f9408a..d8b3f3854af867 100644 --- a/plugins/destination/kafka/go.mod +++ b/plugins/destination/kafka/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/Shopify/sarama v1.37.2 github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 - github.com/cloudquery/filetypes/v4 v4.1.2 + github.com/cloudquery/filetypes/v4 v4.1.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/rs/zerolog v1.30.0 ) diff --git a/plugins/destination/kafka/go.sum b/plugins/destination/kafka/go.sum index eee49df6bbfd93..b66792531ccd11 100644 --- a/plugins/destination/kafka/go.sum +++ b/plugins/destination/kafka/go.sum @@ -56,8 +56,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/filetypes/v4 v4.1.2 h1:u4/2BvqbwxtAEo619VSaf90uxkPEfTzrMM67sYmrweg= -github.com/cloudquery/filetypes/v4 v4.1.2/go.mod h1:zi8i4KklbZWqfPa0mCmKJN3tELvLJcI6UudZtrPAHtc= +github.com/cloudquery/filetypes/v4 v4.1.3 h1:Yd+cUv3aDdhQSum1wUqxFbxzyk+LjcA0XA9bWWhncCc= +github.com/cloudquery/filetypes/v4 v4.1.3/go.mod h1:iiy/HFRlfRSWr/AQ2CgqxQTsY0gJKxpk+xzxZttoCsQ= github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= diff --git a/plugins/destination/s3/go.mod b/plugins/destination/s3/go.mod index 744291b7580b9e..14a56f0a7340bc 100644 --- a/plugins/destination/s3/go.mod +++ b/plugins/destination/s3/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.33 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.77 github.com/aws/aws-sdk-go-v2/service/s3 v1.38.2 - github.com/cloudquery/filetypes/v4 v4.1.2 + github.com/cloudquery/filetypes/v4 v4.1.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.3.0 diff --git a/plugins/destination/s3/go.sum b/plugins/destination/s3/go.sum index cadf78963cc635..ec568ca20d456c 100644 --- a/plugins/destination/s3/go.sum +++ b/plugins/destination/s3/go.sum @@ -91,8 +91,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/filetypes/v4 v4.1.2 h1:u4/2BvqbwxtAEo619VSaf90uxkPEfTzrMM67sYmrweg= -github.com/cloudquery/filetypes/v4 v4.1.2/go.mod h1:zi8i4KklbZWqfPa0mCmKJN3tELvLJcI6UudZtrPAHtc= +github.com/cloudquery/filetypes/v4 v4.1.3 h1:Yd+cUv3aDdhQSum1wUqxFbxzyk+LjcA0XA9bWWhncCc= +github.com/cloudquery/filetypes/v4 v4.1.3/go.mod h1:iiy/HFRlfRSWr/AQ2CgqxQTsY0gJKxpk+xzxZttoCsQ= github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= From d5ea619c1e445e3b0dff952172e505f1709737a6 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 20:15:47 +0300 Subject: [PATCH 52/87] chore: Update plugin `source-fastly` version to v2.1.5 (#13123) Updates the `source-fastly` plugin latest version to v2.1.5 --- website/versions/source-fastly.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-fastly.json b/website/versions/source-fastly.json index 424e2ba8d393e9..98c78b8b8cbb4f 100644 --- a/website/versions/source-fastly.json +++ b/website/versions/source-fastly.json @@ -1 +1 @@ -{ "latest": "plugins-source-fastly-v2.1.4" } +{ "latest": "plugins-source-fastly-v2.1.5" } From d77cdf59204b3c8b6fd31b3dd4a8d3ad76c33e85 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 20:26:44 +0300 Subject: [PATCH 53/87] chore: Update plugin `source-firestore` version to v3.0.5 (#13125) Updates the `source-firestore` plugin latest version to v3.0.5 --- website/versions/source-firestore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-firestore.json b/website/versions/source-firestore.json index 8b6835f25a12c0..574fcb75b05164 100644 --- a/website/versions/source-firestore.json +++ b/website/versions/source-firestore.json @@ -1 +1 @@ -{ "latest": "plugins-source-firestore-v3.0.4" } +{ "latest": "plugins-source-firestore-v3.0.5" } From 9129eb8430069a29a4e8680f3868166467245b89 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 20:43:04 +0300 Subject: [PATCH 54/87] chore: Update plugin `source-azure` version to v9.3.1 (#13124) Updates the `source-azure` plugin latest version to v9.3.1 --- website/versions/source-azure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-azure.json b/website/versions/source-azure.json index a9b68ed01dcc71..2f8c3c6700efa9 100644 --- a/website/versions/source-azure.json +++ b/website/versions/source-azure.json @@ -1 +1 @@ -{ "latest": "plugins-source-azure-v9.3.0" } +{ "latest": "plugins-source-azure-v9.3.1" } From 99e6889c49f66e66d03fbf76064d779a77281f70 Mon Sep 17 00:00:00 2001 From: Ben Bernays Date: Tue, 15 Aug 2023 12:54:59 -0500 Subject: [PATCH 55/87] feat: Instantiate services at sync time rather than during init phase of sync (#13059) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary This will reduce memory usage in most cases, unless a user is running `tables:["*"]`. This will instantiate the service client the first time a client needs it rather than instantiating every single supported client during initialization phase of the sync. If a user doesn't use a service, it will never be instantiated --------- Co-authored-by: Herman Schaaf --- plugins/source/aws/CONTRIBUTING.md | 5 +- plugins/source/aws/client/account.go | 1 - plugins/source/aws/client/client.go | 30 +- plugins/source/aws/client/service_names.go | 256 ++++++++ plugins/source/aws/client/services.go | 620 ++++++++++++++---- plugins/source/aws/client/testing.go | 2 + .../accessanalyzer/analyzer_archive_rules.go | 2 +- .../accessanalyzer/analyzer_findings.go | 2 +- .../services/accessanalyzer/analyzers.go | 2 +- .../services/account/alternate_contacts.go | 2 +- .../resources/services/account/contacts.go | 2 +- .../resources/services/acm/certificates.go | 6 +- .../acmpca/certificate_authorities.go | 4 +- .../services/amp/rule_groups_namespaces.go | 4 +- .../aws/resources/services/amp/workspaces.go | 8 +- .../aws/resources/services/amplify/apps.go | 2 +- .../resources/services/apigateway/api_keys.go | 2 +- .../apigateway/client_certificates.go | 2 +- .../domain_name_base_path_mappings.go | 2 +- .../services/apigateway/domain_names.go | 2 +- .../apigateway/rest_api_authorizers.go | 2 +- .../apigateway/rest_api_deployments.go | 2 +- .../rest_api_documentation_parts.go | 2 +- .../rest_api_documentation_versions.go | 2 +- .../apigateway/rest_api_gateway_responses.go | 2 +- .../services/apigateway/rest_api_models.go | 4 +- .../apigateway/rest_api_request_validators.go | 2 +- .../rest_api_resource_method_integration.go | 2 +- .../apigateway/rest_api_resource_methods.go | 2 +- .../services/apigateway/rest_api_resources.go | 2 +- .../services/apigateway/rest_api_stages.go | 2 +- .../services/apigateway/rest_apis.go | 2 +- .../services/apigateway/usage_plans.go | 4 +- .../services/apigateway/vpc_links.go | 2 +- .../services/apigatewayv2/api_authorizers.go | 2 +- .../services/apigatewayv2/api_deployments.go | 2 +- .../apigatewayv2/api_integration_responses.go | 2 +- .../services/apigatewayv2/api_integrations.go | 2 +- .../services/apigatewayv2/api_models.go | 4 +- .../apigatewayv2/api_route_responses.go | 2 +- .../services/apigatewayv2/api_routes.go | 2 +- .../services/apigatewayv2/api_stages.go | 2 +- .../resources/services/apigatewayv2/apis.go | 2 +- .../domain_name_rest_api_mappings.go | 2 +- .../services/apigatewayv2/domain_names.go | 2 +- .../services/apigatewayv2/vpc_links.go | 2 +- .../services/appconfig/applications.go | 2 +- .../appconfig/configuration_profiles.go | 4 +- .../appconfig/deployment_strategies.go | 2 +- .../services/appconfig/environments.go | 2 +- .../appconfig/hosted_config_versions.go | 4 +- .../aws/resources/services/appflow/flows.go | 4 +- .../applicationautoscaling/policies.go | 2 +- .../scalable_targets.go | 2 +- .../scaling_activities.go | 2 +- .../scheduled_actions.go | 2 +- .../aws/resources/services/appmesh/meshes.go | 6 +- .../services/appmesh/virtual_gateways.go | 4 +- .../services/appmesh/virtual_nodes.go | 4 +- .../services/appmesh/virtual_routers.go | 4 +- .../services/appmesh/virtual_services.go | 4 +- .../apprunner/auto_scaling_configurations.go | 4 +- .../services/apprunner/connections.go | 2 +- .../services/apprunner/custom_domains.go | 2 +- .../apprunner/observability_configurations.go | 4 +- .../services/apprunner/operations.go | 2 +- .../resources/services/apprunner/services.go | 4 +- .../resources/services/apprunner/tag_fetch.go | 2 +- .../services/apprunner/vpc_connectors.go | 2 +- .../apprunner/vpc_ingress_connections.go | 4 +- .../services/appstream/app_blocks.go | 2 +- .../application_fleet_associations.go | 2 +- .../services/appstream/applications.go | 2 +- .../services/appstream/directory_configs.go | 2 +- .../resources/services/appstream/fleets.go | 2 +- .../services/appstream/image_builders.go | 2 +- .../resources/services/appstream/images.go | 2 +- .../services/appstream/stack_entitlements.go | 2 +- .../appstream/stack_user_associations.go | 2 +- .../resources/services/appstream/stacks.go | 2 +- .../appstream/usage_report_subscriptions.go | 2 +- .../aws/resources/services/appstream/users.go | 2 +- .../services/appsync/graphql_apis.go | 2 +- .../athena/data_catalog_database_tables.go | 2 +- .../services/athena/data_catalog_databases.go | 2 +- .../services/athena/data_catalogs.go | 6 +- .../athena/work_group_named_queries.go | 4 +- .../athena/work_group_prepared_statements.go | 4 +- .../athena/work_group_query_executions.go | 4 +- .../resources/services/athena/work_groups.go | 6 +- .../services/auditmanager/assesments.go | 4 +- .../autoscaling/group_lifecycle_hooks.go | 2 +- .../autoscaling/group_scaling_policies.go | 2 +- .../resources/services/autoscaling/groups.go | 6 +- .../autoscaling/launch_configurations.go | 2 +- .../services/autoscaling/scheduled_actions.go | 2 +- .../autoscalingplans/plan_resources.go | 2 +- .../services/autoscalingplans/plans.go | 2 +- .../services/backup/global_settings.go | 2 +- .../aws/resources/services/backup/jobs.go | 2 +- .../services/backup/plan_selections.go | 2 +- .../aws/resources/services/backup/plans.go | 6 +- .../services/backup/protected_resources.go | 2 +- .../services/backup/region_settings.go | 2 +- .../resources/services/backup/report_plans.go | 4 +- .../services/backup/vault_recovery_points.go | 4 +- .../aws/resources/services/backup/vaults.go | 8 +- .../services/batch/compute_environments.go | 4 +- .../services/batch/job_definitions.go | 4 +- .../resources/services/batch/job_queues.go | 4 +- .../aws/resources/services/batch/jobs.go | 4 +- .../stack_instance_resource_drifts.go | 2 +- .../cloudformation/stack_instances.go | 2 +- .../cloudformation/stack_resources.go | 2 +- .../cloudformation/stack_templates.go | 2 +- .../services/cloudformation/stacks.go | 2 +- .../stackset_operation_results.go | 2 +- .../cloudformation/stackset_operations.go | 4 +- .../services/cloudformation/stacksets.go | 4 +- .../cloudformation/template_summaries.go | 2 +- .../services/cloudfront/cache_policies.go | 3 +- .../services/cloudfront/distributions.go | 6 +- .../services/cloudfront/functions.go | 5 +- .../cloudfront/origin_access_identities.go | 3 +- .../cloudfront/origin_request_policies.go | 3 +- .../cloudfront/response_headers_policies.go | 3 +- .../resources/services/cloudhsmv2/backups.go | 2 +- .../resources/services/cloudhsmv2/clusters.go | 2 +- .../resources/services/cloudtrail/channels.go | 4 +- .../resources/services/cloudtrail/events.go | 2 +- .../resources/services/cloudtrail/imports.go | 4 +- .../cloudtrail/trail_event_selectors.go | 2 +- .../resources/services/cloudtrail/trails.go | 4 +- .../resources/services/cloudwatch/alarms.go | 4 +- .../services/cloudwatch/metric_statistics.go | 2 +- .../resources/services/cloudwatch/metrics.go | 2 +- .../data_protection_policies.go | 2 +- .../services/cloudwatchlogs/log_groups.go | 4 +- .../services/cloudwatchlogs/metric_filters.go | 2 +- .../cloudwatchlogs/resource_policies.go | 2 +- .../cloudwatchlogs/subscription_filters.go | 2 +- .../services/codeartifact/domains.go | 4 +- .../services/codeartifact/helpers.go | 2 +- .../services/codeartifact/repositories.go | 4 +- .../resources/services/codebuild/builds.go | 2 +- .../resources/services/codebuild/projects.go | 2 +- .../services/codebuild/source_credentials.go | 2 +- .../services/codecommit/repositories.go | 6 +- .../services/codepipeline/pipelines.go | 6 +- .../services/codepipeline/webhooks.go | 2 +- .../services/cognito/identity_pools.go | 4 +- .../cognito/user_pool_identity_providers.go | 4 +- .../resources/services/cognito/user_pools.go | 4 +- .../autoscaling_groups_recommendations.go | 3 +- .../ebs_volume_recommendations.go | 2 +- .../ec2_instance_recommendations.go | 2 +- .../ecs_service_recommendations.go | 3 +- .../computeoptimizer/enrollment_status.go | 4 +- .../lambda_functions_recommendations.go | 3 +- .../config/config_rule_compliance_details.go | 2 +- .../config/config_rule_compliances.go | 2 +- .../resources/services/config/config_rules.go | 2 +- .../config/configuration_aggregators.go | 2 +- .../config/configuration_recorders.go | 2 +- .../conformance_pack_rule_compliances.go | 2 +- .../services/config/conformance_packs.go | 2 +- .../config/deliver_channel_statuses.go | 2 +- .../services/config/delivery_channels.go | 2 +- .../config/remediation_configurations.go | 2 +- .../config/retention_configurations.go | 2 +- .../services/costexplorer/cost_custom.go | 2 +- .../services/costexplorer/cost_thirty_days.go | 2 +- .../costexplorer/forecast_thirty_days.go | 2 +- .../aws/resources/services/dax/clusters.go | 4 +- .../resources/services/detective/graphs.go | 4 +- .../resources/services/detective/members.go | 2 +- .../services/directconnect/connections.go | 2 +- .../directconnect/gateway_associations.go | 2 +- .../directconnect/gateway_attachments.go | 2 +- .../services/directconnect/gateways.go | 2 +- .../resources/services/directconnect/lags.go | 2 +- .../services/directconnect/locations.go | 2 +- .../directconnect/virtual_gateways.go | 2 +- .../directconnect/virtual_interfaces.go | 2 +- .../services/dms/replication_instances.go | 2 +- .../resources/services/docdb/certificates.go | 2 +- .../docdb/cluster_parameter_groups.go | 4 +- .../services/docdb/cluster_parameters.go | 2 +- .../services/docdb/cluster_snapshots.go | 4 +- .../aws/resources/services/docdb/clusters.go | 2 +- .../services/docdb/engine_versions.go | 2 +- .../services/docdb/event_categories.go | 2 +- .../services/docdb/event_subscriptions.go | 2 +- .../aws/resources/services/docdb/events.go | 2 +- .../services/docdb/global_clusters.go | 2 +- .../aws/resources/services/docdb/helpers.go | 2 +- .../aws/resources/services/docdb/instances.go | 2 +- .../docdb/orderable_db_instance_options.go | 2 +- .../docdb/pending_maintenance_actions.go | 2 +- .../resources/services/docdb/subnet_groups.go | 2 +- .../resources/services/dynamodb/backups.go | 4 +- .../resources/services/dynamodb/exports.go | 4 +- .../services/dynamodb/global_tables.go | 6 +- .../aws/resources/services/dynamodb/tables.go | 10 +- .../services/dynamodbstreams/streams.go | 4 +- .../services/ec2/account_attributes.go | 2 +- .../source/aws/resources/services/ec2/azs.go | 2 +- .../aws/resources/services/ec2/byoip_cidrs.go | 2 +- .../services/ec2/capacity_reservations.go | 2 +- .../services/ec2/customer_gateways.go | 2 +- .../resources/services/ec2/dhcp_options.go | 2 +- .../services/ec2/ebs_snapshot_attributes.go | 2 +- .../resources/services/ec2/ebs_snapshots.go | 2 +- .../services/ec2/ebs_volume_statuses.go | 2 +- .../aws/resources/services/ec2/ebs_volumes.go | 2 +- .../ec2/egress_only_internet_gateways.go | 2 +- .../source/aws/resources/services/ec2/eips.go | 2 +- .../aws/resources/services/ec2/flow_logs.go | 2 +- .../aws/resources/services/ec2/hosts.go | 2 +- .../services/ec2/image_attributes.go | 2 +- .../services/ec2/image_last_launched.go | 2 +- .../aws/resources/services/ec2/images.go | 2 +- .../services/ec2/instance_connect.go | 2 +- .../services/ec2/instance_statuses.go | 2 +- .../resources/services/ec2/instance_types.go | 2 +- .../aws/resources/services/ec2/instances.go | 2 +- .../services/ec2/internet_gateways.go | 2 +- .../aws/resources/services/ec2/key_pairs.go | 2 +- .../services/ec2/launch_template_versions.go | 2 +- .../services/ec2/launch_templates.go | 2 +- .../services/ec2/managed_prefix_lists.go | 2 +- .../resources/services/ec2/nat_gateways.go | 2 +- .../resources/services/ec2/network_acls.go | 2 +- .../services/ec2/network_interfaces.go | 2 +- .../services/ec2/regional_configs.go | 2 +- .../aws/resources/services/ec2/regions.go | 2 +- .../services/ec2/reserved_instances.go | 2 +- .../resources/services/ec2/route_tables.go | 2 +- .../resources/services/ec2/security_groups.go | 2 +- .../services/ec2/spot_fleet_instances.go | 2 +- .../services/ec2/spot_fleet_requests.go | 2 +- .../services/ec2/spot_instance_requests.go | 2 +- .../aws/resources/services/ec2/subnets.go | 2 +- .../ec2/transit_gateway_attachments.go | 2 +- .../ec2/transit_gateway_multicast_domains.go | 2 +- .../transit_gateway_peering_attachments.go | 2 +- .../ec2/transit_gateway_route_tables.go | 2 +- .../ec2/transit_gateway_vpc_attachments.go | 2 +- .../services/ec2/transit_gateways.go | 2 +- .../vpc_endpoint_service_configurations.go | 2 +- .../ec2/vpc_endpoint_service_permissions.go | 2 +- .../services/ec2/vpc_endpoint_services.go | 2 +- .../resources/services/ec2/vpc_endpoints.go | 2 +- .../services/ec2/vpc_peering_connections.go | 2 +- .../source/aws/resources/services/ec2/vpcs.go | 2 +- .../resources/services/ec2/vpn_connections.go | 2 +- .../resources/services/ec2/vpn_gateways.go | 2 +- .../services/ecr/lifecycle_policy.go | 2 +- .../services/ecr/pull_through_cache_rules.go | 2 +- .../aws/resources/services/ecr/registries.go | 2 +- .../services/ecr/registry_policies.go | 2 +- .../resources/services/ecr/repositories.go | 6 +- .../ecr/repository_image_scan_findings.go | 2 +- .../services/ecr/repository_images.go | 2 +- .../services/ecrpublic/repositories.go | 4 +- .../services/ecrpublic/repository_images.go | 2 +- .../ecs/cluster_container_instances.go | 2 +- .../services/ecs/cluster_services.go | 2 +- .../services/ecs/cluster_task_sets.go | 2 +- .../resources/services/ecs/cluster_tasks.go | 4 +- .../aws/resources/services/ecs/clusters.go | 2 +- .../services/ecs/task_definitions.go | 4 +- .../resources/services/efs/accesspoints.go | 2 +- .../aws/resources/services/efs/filesystems.go | 4 +- .../aws/resources/services/eks/add_ons.go | 4 +- .../aws/resources/services/eks/clusters.go | 4 +- .../services/eks/fargate_profiles.go | 4 +- .../services/eks/identity_provider_configs.go | 4 +- .../aws/resources/services/eks/node_groups.go | 4 +- .../services/elasticache/clusters.go | 4 +- .../services/elasticache/engine_versions.go | 2 +- .../resources/services/elasticache/events.go | 2 +- .../elasticache/global_replication_groups.go | 2 +- .../services/elasticache/parameter_groups.go | 2 +- .../elasticache/replication_groups.go | 4 +- .../elasticache/reserved_cache_nodes.go | 2 +- .../reserved_cache_nodes_offerings.go | 2 +- .../services/elasticache/service_updates.go | 2 +- .../services/elasticache/snapshots.go | 2 +- .../services/elasticache/subnet_groups.go | 2 +- .../services/elasticache/update_actions.go | 2 +- .../services/elasticache/user_groups.go | 2 +- .../resources/services/elasticache/users.go | 2 +- .../elasticbeanstalk/application_versions.go | 2 +- .../services/elasticbeanstalk/applications.go | 4 +- .../elasticbeanstalk/configuration_options.go | 2 +- .../configuration_settings.go | 2 +- .../services/elasticbeanstalk/environments.go | 4 +- .../services/elasticsearch/domains.go | 8 +- .../services/elasticsearch/packages.go | 2 +- .../services/elasticsearch/versions.go | 4 +- .../services/elasticsearch/vpc_endpoints.go | 2 +- .../elastictranscoder/pipeline_jobs.go | 2 +- .../services/elastictranscoder/pipelines.go | 2 +- .../services/elastictranscoder/presets.go | 2 +- .../services/elbv1/load_balancer_policies.go | 2 +- .../services/elbv1/load_balancers.go | 2 +- .../services/elbv2/listener_certificates.go | 2 +- .../services/elbv2/listener_rules.go | 2 +- .../aws/resources/services/elbv2/listeners.go | 4 +- .../elbv2/load_balancer_attributes.go | 2 +- .../services/elbv2/load_balancer_web_acls.go | 2 +- .../services/elbv2/load_balancers.go | 4 +- ...target_group_target_health_descriptions.go | 2 +- .../resources/services/elbv2/target_groups.go | 4 +- .../emr/block_public_access_configs.go | 2 +- .../services/emr/cluster_instance_fleets.go | 2 +- .../services/emr/cluster_instance_groups.go | 2 +- .../services/emr/cluster_instances.go | 2 +- .../aws/resources/services/emr/clusters.go | 4 +- .../services/emr/notebook_executions.go | 5 +- .../resources/services/emr/release_labels.go | 5 +- .../services/emr/security_configuration.go | 4 +- .../aws/resources/services/emr/steps.go | 5 +- .../services/emr/studio_session_mapping.go | 5 +- .../aws/resources/services/emr/studios.go | 5 +- .../services/emr/supported_instance_types.go | 3 +- .../services/eventbridge/api_destinations.go | 2 +- .../services/eventbridge/archives.go | 2 +- .../services/eventbridge/connections.go | 2 +- .../services/eventbridge/endpoints.go | 2 +- .../services/eventbridge/event_bus_rules.go | 2 +- .../services/eventbridge/event_bus_targets.go | 2 +- .../services/eventbridge/event_buses.go | 4 +- .../services/eventbridge/event_sources.go | 2 +- .../resources/services/eventbridge/replays.go | 4 +- .../services/firehose/delivery_streams.go | 6 +- .../services/frauddetector/batch_imports.go | 2 +- .../frauddetector/batch_predictions.go | 2 +- .../services/frauddetector/detectors.go | 2 +- .../services/frauddetector/entity_types.go | 2 +- .../services/frauddetector/event_types.go | 2 +- .../services/frauddetector/external_models.go | 2 +- .../services/frauddetector/labels.go | 2 +- .../services/frauddetector/model_versions.go | 2 +- .../services/frauddetector/models.go | 2 +- .../services/frauddetector/outcomes.go | 2 +- .../resources/services/frauddetector/rules.go | 2 +- .../services/frauddetector/tag_fetch.go | 2 +- .../services/frauddetector/variables.go | 2 +- .../aws/resources/services/fsx/backups.go | 2 +- .../fsx/data_repository_associations.go | 2 +- .../services/fsx/data_repository_tasks.go | 2 +- .../aws/resources/services/fsx/file_caches.go | 4 +- .../resources/services/fsx/file_systems.go | 2 +- .../aws/resources/services/fsx/snapshots.go | 2 +- .../services/fsx/storage_virtual_machines.go | 2 +- .../aws/resources/services/fsx/volumes.go | 2 +- .../glacier/data_retrieval_policies.go | 2 +- .../services/glacier/vault_access_policies.go | 2 +- .../services/glacier/vault_lock_policies.go | 2 +- .../services/glacier/vault_notifications.go | 2 +- .../aws/resources/services/glacier/vaults.go | 4 +- .../resources/services/glue/classifiers.go | 2 +- .../resources/services/glue/connections.go | 2 +- .../aws/resources/services/glue/crawlers.go | 4 +- .../aws/resources/services/glue/databases.go | 8 +- .../glue/datacatalog_encryption_settings.go | 2 +- .../resources/services/glue/dev_endpoints.go | 4 +- .../aws/resources/services/glue/job_runs.go | 2 +- .../aws/resources/services/glue/jobs.go | 4 +- .../services/glue/ml_transform_task_runs.go | 2 +- .../resources/services/glue/ml_transforms.go | 4 +- .../aws/resources/services/glue/registries.go | 4 +- .../services/glue/registry_schema_versions.go | 6 +- .../services/glue/registry_schemas.go | 6 +- .../services/glue/security_configurations.go | 2 +- .../aws/resources/services/glue/triggers.go | 6 +- .../aws/resources/services/glue/workflows.go | 6 +- .../services/guardduty/detector_filters.go | 4 +- .../services/guardduty/detector_findings.go | 2 +- .../services/guardduty/detector_ipsets.go | 4 +- .../services/guardduty/detector_members.go | 2 +- .../detector_publishing_destinations.go | 2 +- .../guardduty/detector_threat_intel_sets.go | 4 +- .../resources/services/guardduty/detectors.go | 4 +- .../aws/resources/services/iam/accounts.go | 2 +- .../services/iam/credential_reports.go | 2 +- .../services/iam/group_attached_policies.go | 2 +- .../resources/services/iam/group_policies.go | 4 +- .../aws/resources/services/iam/groups.go | 2 +- .../services/iam/instance_profiles.go | 4 +- .../services/iam/last_accessed_details.go | 2 +- .../iam/openid_connect_identity_providers.go | 4 +- .../services/iam/password_policies.go | 2 +- .../aws/resources/services/iam/policies.go | 4 +- .../services/iam/role_attached_policies.go | 2 +- .../resources/services/iam/role_policies.go | 4 +- .../aws/resources/services/iam/roles.go | 4 +- .../services/iam/saml_identity_providers.go | 4 +- .../services/iam/server_certificates.go | 2 +- .../services/iam/signing_certificates.go | 2 +- .../resources/services/iam/ssh_public_keys.go | 2 +- .../services/iam/user_access_keys.go | 4 +- .../services/iam/user_attached_policies.go | 2 +- .../aws/resources/services/iam/user_groups.go | 2 +- .../resources/services/iam/user_policies.go | 4 +- .../aws/resources/services/iam/users.go | 4 +- .../services/iam/virtual_mfa_devices.go | 2 +- .../identitystore/group_memberships.go | 2 +- .../services/identitystore/groups.go | 2 +- .../services/identitystore/instance_fetch.go | 2 +- .../resources/services/identitystore/users.go | 2 +- .../resources/services/inspector/findings.go | 2 +- .../resources/services/inspector2/findings.go | 2 +- .../resources/services/iot/billing_groups.go | 8 +- .../resources/services/iot/ca_certificates.go | 6 +- .../resources/services/iot/certificates.go | 6 +- .../source/aws/resources/services/iot/jobs.go | 6 +- .../aws/resources/services/iot/policies.go | 6 +- .../services/iot/security_profiles.go | 8 +- .../aws/resources/services/iot/streams.go | 4 +- .../resources/services/iot/thing_groups.go | 10 +- .../aws/resources/services/iot/thing_types.go | 4 +- .../aws/resources/services/iot/things.go | 4 +- .../aws/resources/services/iot/topic_rules.go | 6 +- .../services/kafka/cluster_operations.go | 2 +- .../aws/resources/services/kafka/clusters.go | 4 +- .../services/kafka/configurations.go | 2 +- .../aws/resources/services/kafka/helpers.go | 2 +- .../aws/resources/services/kafka/nodes.go | 2 +- .../aws/resources/services/kinesis/streams.go | 6 +- .../aws/resources/services/kms/aliases.go | 2 +- .../aws/resources/services/kms/key_grants.go | 2 +- .../resources/services/kms/key_policies.go | 2 +- .../source/aws/resources/services/kms/keys.go | 8 +- .../services/lambda/function_aliases.go | 4 +- .../lambda/function_concurrency_configs.go | 2 +- .../lambda/function_event_invoke_configs.go | 2 +- .../lambda/function_event_source_mappings.go | 2 +- .../services/lambda/function_versions.go | 2 +- .../resources/services/lambda/functions.go | 10 +- .../aws/resources/services/lambda/layers.go | 6 +- .../resources/services/lightsail/alarms.go | 2 +- .../services/lightsail/bucket_access_keys.go | 2 +- .../resources/services/lightsail/buckets.go | 2 +- .../services/lightsail/certificates.go | 2 +- .../container_service_deployments.go | 2 +- .../lightsail/container_service_images.go | 2 +- .../services/lightsail/container_services.go | 2 +- .../services/lightsail/database_events.go | 2 +- .../services/lightsail/database_log_events.go | 4 +- .../services/lightsail/database_parameters.go | 2 +- .../services/lightsail/database_snapshots.go | 2 +- .../resources/services/lightsail/databases.go | 2 +- .../services/lightsail/disk_snapshots.go | 2 +- .../aws/resources/services/lightsail/disks.go | 2 +- .../services/lightsail/distributions.go | 4 +- .../lightsail/instance_port_states.go | 2 +- .../services/lightsail/instance_snapshots.go | 2 +- .../resources/services/lightsail/instances.go | 4 +- .../load_balancer_tls_certificates.go | 2 +- .../services/lightsail/load_balancers.go | 2 +- .../services/lightsail/static_ips.go | 2 +- .../mq/broker_configuration_revisions.go | 4 +- .../services/mq/broker_configurations.go | 2 +- .../aws/resources/services/mq/broker_users.go | 2 +- .../aws/resources/services/mq/brokers.go | 4 +- .../resources/services/mwaa/environments.go | 4 +- .../cluster_parameter_group_parameters.go | 4 +- .../neptune/cluster_parameter_groups.go | 2 +- .../services/neptune/cluster_snapshots.go | 6 +- .../resources/services/neptune/clusters.go | 4 +- .../services/neptune/db_parameter_groups.go | 6 +- .../services/neptune/event_subscriptions.go | 4 +- .../services/neptune/global_clusters.go | 2 +- .../resources/services/neptune/instances.go | 4 +- .../services/neptune/subnet_groups.go | 4 +- .../networkfirewall/firewall_policies.go | 4 +- .../services/networkfirewall/firewalls.go | 4 +- .../services/networkfirewall/rule_groups.go | 4 +- .../tls_inspection_configurations.go | 4 +- .../networkmanager/global_networks.go | 2 +- .../resources/services/networkmanager/link.go | 2 +- .../services/networkmanager/sites.go | 2 +- .../transit_gateway_registrations.go | 2 +- .../services/organizations/account_parents.go | 2 +- .../services/organizations/accounts.go | 4 +- .../organizations/delegated_admins.go | 2 +- .../organizations/delegated_services.go | 2 +- .../organizational_unit_parents.go | 2 +- .../organizations/organizational_units.go | 4 +- .../services/organizations/organizations.go | 2 +- .../services/organizations/policies.go | 4 +- .../organizations/resource_policies.go | 2 +- .../resources/services/organizations/roots.go | 4 +- .../qldb/ledger_journal_kinesis_streams.go | 2 +- .../qldb/ledger_journal_s3_exports.go | 2 +- .../aws/resources/services/qldb/ledgers.go | 6 +- .../resources/services/quicksight/analyses.go | 4 +- .../services/quicksight/dashboards.go | 2 +- .../services/quicksight/data_sets.go | 2 +- .../services/quicksight/data_sources.go | 2 +- .../resources/services/quicksight/folders.go | 4 +- .../services/quicksight/group_members.go | 2 +- .../resources/services/quicksight/groups.go | 2 +- .../services/quicksight/ingestions.go | 2 +- .../services/quicksight/tag_fetch.go | 2 +- .../services/quicksight/templates.go | 2 +- .../resources/services/quicksight/users.go | 2 +- .../aws/resources/services/ram/principals.go | 2 +- .../ram/resource_share_associations.go | 2 +- .../ram/resource_share_invitations.go | 2 +- .../ram/resource_share_permissions.go | 4 +- .../resources/services/ram/resource_shares.go | 2 +- .../resources/services/ram/resource_types.go | 2 +- .../aws/resources/services/ram/resources.go | 2 +- .../resources/services/rds/certificates.go | 2 +- .../services/rds/cluster_backtracks.go | 2 +- .../rds/cluster_parameter_group_parameters.go | 2 +- .../services/rds/cluster_parameter_groups.go | 4 +- .../services/rds/cluster_parameters.go | 2 +- .../services/rds/cluster_snapshots.go | 4 +- .../aws/resources/services/rds/clusters.go | 2 +- .../services/rds/db_parameter_groups.go | 6 +- .../aws/resources/services/rds/db_proxies.go | 4 +- .../services/rds/db_security_groups.go | 4 +- .../resources/services/rds/db_snapshots.go | 4 +- .../resources/services/rds/engine_versions.go | 2 +- .../services/rds/event_subscriptions.go | 4 +- .../aws/resources/services/rds/events.go | 2 +- .../aws/resources/services/rds/instances.go | 2 +- .../resources/services/rds/option_groups.go | 2 +- .../services/rds/reserved_instances.go | 4 +- .../resources/services/rds/subnet_groups.go | 2 +- .../services/redshift/cluster_parameters.go | 2 +- .../resources/services/redshift/clusters.go | 4 +- .../services/redshift/data_shares.go | 2 +- .../services/redshift/endpoint_access.go | 2 +- .../redshift/endpoint_authorization.go | 2 +- .../services/redshift/event_subscriptions.go | 2 +- .../aws/resources/services/redshift/events.go | 2 +- .../resources/services/redshift/snapshots.go | 2 +- .../services/redshift/subnet_groups.go | 2 +- .../resiliencehub/alarm_recommendations.go | 2 +- .../services/resiliencehub/app_assessments.go | 4 +- .../app_component_compliances.go | 2 +- .../app_version_resource_mappings.go | 2 +- .../resiliencehub/app_version_resources.go | 2 +- .../services/resiliencehub/app_versions.go | 2 +- .../resources/services/resiliencehub/apps.go | 4 +- .../component_recommendations.go | 2 +- .../resiliencehub/recommendation_templates.go | 2 +- .../resiliencehub/resiliency_policies.go | 2 +- .../resiliencehub/sop_recommendations.go | 2 +- .../suggested_resiliency_policies.go | 2 +- .../resiliencehub/test_recommendations.go | 2 +- .../resourcegroups/resource_groups.go | 6 +- .../services/route53/delegation_sets.go | 2 +- .../aws/resources/services/route53/domains.go | 6 +- .../services/route53/health_checks.go | 2 +- .../hosted_zone_query_logging_configs.go | 2 +- .../hosted_zone_resource_record_sets.go | 2 +- .../hosted_zone_traffic_policy_instances.go | 2 +- .../services/route53/hosted_zones.go | 2 +- .../resources/services/route53/operations.go | 4 +- .../services/route53/traffic_policies.go | 4 +- .../route53recoverycontrolconfig/clusters.go | 2 +- .../control_panel.go | 2 +- .../routing_controls.go | 2 +- .../safety_rules.go | 2 +- .../route53recoveryreadiness/cells.go | 2 +- .../readiness_checks.go | 2 +- .../recovery_groups.go | 2 +- .../route53recoveryreadiness/resource_sets.go | 2 +- .../route53resolver/firewall_configs.go | 2 +- .../route53resolver/firewall_domain_list.go | 4 +- .../firewall_rule_group_associations.go | 2 +- .../route53resolver/firewall_rule_groups.go | 4 +- .../route53resolver/resolver_endpoints.go | 2 +- .../resolver_query_log_config_associations.go | 2 +- .../resolver_query_log_configs.go | 2 +- .../resolver_rule_associations.go | 2 +- .../route53resolver/resolver_rules.go | 2 +- .../resources/services/s3/access_points.go | 2 +- .../aws/resources/services/s3/accounts.go | 2 +- .../services/s3/bucket_cors_rules.go | 2 +- .../services/s3/bucket_encryption_rules.go | 2 +- .../resources/services/s3/bucket_grants.go | 2 +- .../services/s3/bucket_lifecycles.go | 2 +- .../resources/services/s3/bucket_websites.go | 2 +- .../aws/resources/services/s3/buckets.go | 20 +- .../services/s3/multi_region_access_points.go | 2 +- .../aws/resources/services/sagemaker/apps.go | 6 +- .../sagemaker/endpoint_configurations.go | 6 +- .../resources/services/sagemaker/models.go | 6 +- .../services/sagemaker/notebook_instances.go | 6 +- .../services/sagemaker/training_jobs.go | 6 +- .../services/savingsplans/savingsplans.go | 2 +- .../services/scheduler/schedule_groups.go | 2 +- .../resources/services/scheduler/schedules.go | 6 +- .../services/secretsmanager/secrets.go | 6 +- .../secretsmanager/secrets_version.go | 2 +- .../services/securityhub/enabled_standards.go | 2 +- .../services/securityhub/findings.go | 2 +- .../resources/services/securityhub/hubs.go | 4 +- .../services/servicecatalog/launch_paths.go | 2 +- .../services/servicecatalog/portfolios.go | 5 +- .../services/servicecatalog/products.go | 4 +- .../servicecatalog/provisioned_products.go | 2 +- .../servicecatalog/provisioning_artifact.go | 2 +- .../servicecatalog/provisioning_parameters.go | 2 +- .../services/servicediscovery/helpers.go | 2 +- .../services/servicediscovery/instances.go | 4 +- .../services/servicediscovery/namespaces.go | 4 +- .../services/servicediscovery/services.go | 4 +- .../services/servicequotas/quotas.go | 2 +- .../services/servicequotas/services.go | 2 +- .../services/ses/active_receipt_rule_sets.go | 2 +- .../configuration_set_event_destinations.go | 2 +- .../services/ses/configuration_sets.go | 4 +- .../resources/services/ses/contact_lists.go | 4 +- .../custom_verification_email_templates.go | 4 +- .../aws/resources/services/ses/identities.go | 4 +- .../aws/resources/services/ses/templates.go | 4 +- .../aws/resources/services/shield/attacks.go | 4 +- .../services/shield/protection_groups.go | 4 +- .../resources/services/shield/protections.go | 4 +- .../services/shield/subscriptions.go | 2 +- .../aws/resources/services/signer/profiles.go | 4 +- .../resources/services/sns/subscriptions.go | 4 +- .../aws/resources/services/sns/topics.go | 6 +- .../aws/resources/services/sqs/queues.go | 6 +- .../resources/services/ssm/associations.go | 2 +- .../services/ssm/compliance_summary_items.go | 2 +- .../services/ssm/document_versions.go | 2 +- .../aws/resources/services/ssm/documents.go | 6 +- .../services/ssm/instance_compliance_items.go | 2 +- .../services/ssm/instance_patches.go | 2 +- .../aws/resources/services/ssm/instances.go | 2 +- .../aws/resources/services/ssm/inventories.go | 2 +- .../services/ssm/inventory_schemas.go | 2 +- .../aws/resources/services/ssm/parameters.go | 2 +- .../resources/services/ssm/patch_baselines.go | 2 +- .../aws/resources/services/ssm/sessions.go | 2 +- .../services/ssoadmin/account_assignments.go | 2 +- .../ssoadmin/customer_managed_policies.go | 2 +- .../services/ssoadmin/inline_policies.go | 2 +- .../resources/services/ssoadmin/instances.go | 2 +- .../services/ssoadmin/managed_policies.go | 2 +- .../ssoadmin/permission_boundaries.go | 2 +- .../services/ssoadmin/permission_sets.go | 4 +- .../services/stepfunctions/activities.go | 2 +- .../services/stepfunctions/executions.go | 4 +- .../stepfunctions/executions_map_runs.go | 4 +- .../executions_map_runs_executions.go | 2 +- .../services/stepfunctions/state_machines.go | 6 +- .../aws/resources/services/support/cases.go | 2 +- .../services/support/communications.go | 2 +- .../resources/services/support/services.go | 2 +- .../services/support/severity_levels.go | 2 +- .../support/trusted_advisor_check_results.go | 2 +- .../trusted_advisor_check_summaries.go | 2 +- .../support/trusted_advisor_checks.go | 2 +- .../services/timestream/databases.go | 4 +- .../resources/services/timestream/tables.go | 2 +- .../resources/services/transfer/servers.go | 6 +- .../aws/resources/services/waf/rule_groups.go | 6 +- .../aws/resources/services/waf/rules.go | 4 +- .../services/waf/subscribed_rule_groups.go | 2 +- .../aws/resources/services/waf/web_acls.go | 4 +- .../services/wafregional/rate_based_rules.go | 4 +- .../services/wafregional/rule_groups.go | 6 +- .../resources/services/wafregional/rules.go | 4 +- .../services/wafregional/web_acls.go | 6 +- .../aws/resources/services/wafv2/ipsets.go | 6 +- .../services/wafv2/managed_rule_groups.go | 4 +- .../services/wafv2/regex_pattern_sets.go | 6 +- .../resources/services/wafv2/rule_groups.go | 8 +- .../aws/resources/services/wafv2/web_acls.go | 10 +- .../lens_review_improvements.go | 2 +- .../services/wellarchitected/lens_reviews.go | 2 +- .../services/wellarchitected/lenses.go | 4 +- .../wellarchitected/share_invitations.go | 2 +- .../wellarchitected/workload_milestones.go | 2 +- .../wellarchitected/workload_shares.go | 2 +- .../services/wellarchitected/workloads.go | 4 +- .../services/workspaces/directories.go | 2 +- .../services/workspaces/workspaces.go | 2 +- .../services/xray/encryption_configs.go | 2 +- .../aws/resources/services/xray/groups.go | 4 +- .../services/xray/resource_policies.go | 2 +- .../resources/services/xray/sampling_rules.go | 4 +- 693 files changed, 1782 insertions(+), 1131 deletions(-) create mode 100644 plugins/source/aws/client/service_names.go diff --git a/plugins/source/aws/CONTRIBUTING.md b/plugins/source/aws/CONTRIBUTING.md index 41c466cff371b3..8770a28adf5a2d 100644 --- a/plugins/source/aws/CONTRIBUTING.md +++ b/plugins/source/aws/CONTRIBUTING.md @@ -18,7 +18,10 @@ As a prerequisite, in [aws-sdk-go-v2](https://pkg.go.dev/github.com/aws/aws-sdk- 1. Check in [client/services.go](client/services.go) that the service you need has an interface defined. If it does, you can skip to [Step 2](#step-2-add-a-new-table). If not, read on to learn how to generate the interface. 2. Inside [codegen/main.go](codegen/main.go), add the client for the AWS SDK you need to the `clients` slice. You may need to run `go get github.com/aws/aws-sdk-go-v2/service/` (e.g. `go get github.com/aws/aws-sdk-go-v2/service/dynamodb`) to add the dependency first. -3. Run `make gen-mocks`. This takes a few seconds, but it should add the interface for your client to [client/services.go](client/services.go) and create a mock for it that will be used in unit tests later. +3. Run `make gen-mocks`. This takes a few seconds, but it will create a mock for it that will be used in unit tests later +4. Add the new service to end of the list of values for `AllAWSServiceNames` in [client/service_names.go](client/service_names.go). (This will also require you to create a new constant AWSService) +5. Add a case for the new service name you just added to `InitService` and `GetService` [client/services.go](client/services.go) + ### Step 2. Add a New Table diff --git a/plugins/source/aws/client/account.go b/plugins/source/aws/client/account.go index 5a719baab6d271..e6476eeb83c06f 100644 --- a/plugins/source/aws/client/account.go +++ b/plugins/source/aws/client/account.go @@ -84,7 +84,6 @@ func (c *Client) setupAWSAccount(ctx context.Context, logger zerolog.Logger, aws accountId: *output.Account, svcs: initServices(awsCfg, account.Regions), } - // Do not rely on this field, it will be removed once https://github.com/aws/aws-sdk-go-v2/issues/2163 is resolved c.AWSConfig = &awsCfg return &svcsDetails, nil diff --git a/plugins/source/aws/client/client.go b/plugins/source/aws/client/client.go index fd1d345a8f3549..2b7c77e6762b87 100644 --- a/plugins/source/aws/client/client.go +++ b/plugins/source/aws/client/client.go @@ -33,8 +33,8 @@ type Client struct { Backend state.Client specificRegions bool Spec *Spec - // Do not rely on this field, it will be removed once https://github.com/aws/aws-sdk-go-v2/issues/2163 is resolved - AWSConfig *aws.Config + accountMutex map[string]*sync.Mutex + AWSConfig *aws.Config } type AwsLogger struct { @@ -94,8 +94,9 @@ func NewAwsClient(logger zerolog.Logger, spec *Spec) Client { ServicesManager: ServicesManager{ services: ServicesPartitionAccountMap{}, }, - logger: logger, - Spec: spec, + logger: logger, + Spec: spec, + accountMutex: map[string]*sync.Mutex{}, } } @@ -115,7 +116,17 @@ func (c *Client) ID() string { return strings.TrimRight(strings.Join(idStrings, ":"), ":") } -func (c *Client) Services() *Services { +func (c *Client) updateService(service AWSServiceName) { + c.accountMutex[c.AccountID].Lock() + defer c.accountMutex[c.AccountID].Unlock() + c.ServicesManager.ServicesByPartitionAccount(c.Partition, c.AccountID).InitService(c.AWSConfig, service) +} +func (c *Client) Services(service_names ...AWSServiceName) *Services { + for _, service := range service_names { + if c.ServicesManager.ServicesByPartitionAccount(c.Partition, c.AccountID).GetService(service) == nil { + c.updateService(service) + } + } return c.ServicesManager.ServicesByPartitionAccount(c.Partition, c.AccountID) } @@ -136,6 +147,7 @@ func (c *Client) withPartitionAccountIDAndRegion(partition, accountID, region st Backend: c.Backend, Spec: c.Spec, AWSConfig: c.AWSConfig, + accountMutex: c.accountMutex, } } @@ -150,6 +162,8 @@ func (c *Client) withPartitionAccountIDRegionAndNamespace(partition, accountID, WAFScope: c.WAFScope, Backend: c.Backend, Spec: c.Spec, + AWSConfig: c.AWSConfig, + accountMutex: c.accountMutex, } } @@ -164,6 +178,8 @@ func (c *Client) withPartitionAccountIDRegionAndScope(partition, accountID, regi WAFScope: scope, Backend: c.Backend, Spec: c.Spec, + AWSConfig: c.AWSConfig, + accountMutex: c.accountMutex, } } @@ -217,6 +233,10 @@ func Configure(ctx context.Context, logger zerolog.Logger, spec Spec) (schema.Cl initLock.Lock() defer initLock.Unlock() client.ServicesManager.InitServices(*svcsDetail) + if client.accountMutex[svcsDetail.accountId] == nil { + client.accountMutex[svcsDetail.accountId] = &sync.Mutex{} + } + return nil }) } diff --git a/plugins/source/aws/client/service_names.go b/plugins/source/aws/client/service_names.go new file mode 100644 index 00000000000000..fc30c08fcd2db9 --- /dev/null +++ b/plugins/source/aws/client/service_names.go @@ -0,0 +1,256 @@ +package client + +const ( + AWSServiceAccessanalyzer AWSServiceName = iota + AWSServiceAccount + AWSServiceAcm + AWSServiceAcmpca + AWSServiceAmp + AWSServiceAmplify + AWSServiceApigateway + AWSServiceApigatewayv2 + AWSServiceAppconfig + AWSServiceAppflow + AWSServiceApplicationautoscaling + AWSServiceAppmesh + AWSServiceApprunner + AWSServiceAppstream + AWSServiceAppsync + AWSServiceAthena + AWSServiceAuditmanager + AWSServiceAutoscaling + AWSServiceAutoscalingplans + AWSServiceBackup + AWSServiceBatch + AWSServiceCloudformation + AWSServiceCloudfront + AWSServiceCloudhsmv2 + AWSServiceCloudtrail + AWSServiceCloudwatch + AWSServiceCloudwatchlogs + AWSServiceCodeartifact + AWSServiceCodebuild + AWSServiceCodecommit + AWSServiceCodepipeline + AWSServiceCognitoidentity + AWSServiceCognitoidentityprovider + AWSServiceComputeoptimizer + AWSServiceConfigservice + AWSServiceCostexplorer + AWSServiceDatabasemigrationservice + AWSServiceDax + AWSServiceDetective + AWSServiceDirectconnect + AWSServiceDocdb + AWSServiceDynamodb + AWSServiceDynamodbstreams + AWSServiceEc2 + AWSServiceEcr + AWSServiceEcrpublic + AWSServiceEcs + AWSServiceEfs + AWSServiceEks + AWSServiceElasticache + AWSServiceElasticbeanstalk + AWSServiceElasticloadbalancing + AWSServiceElasticloadbalancingv2 + AWSServiceElasticsearchservice + AWSServiceElastictranscoder + AWSServiceEmr + AWSServiceEventbridge + AWSServiceFirehose + AWSServiceFrauddetector + AWSServiceFsx + AWSServiceGlacier + AWSServiceGlue + AWSServiceGuardduty + AWSServiceIam + AWSServiceIdentitystore + AWSServiceInspector + AWSServiceInspector2 + AWSServiceIot + AWSServiceKafka + AWSServiceKinesis + AWSServiceKms + AWSServiceLambda + AWSServiceLightsail + AWSServiceMq + AWSServiceMwaa + AWSServiceNeptune + AWSServiceNetworkfirewall + AWSServiceNetworkmanager + AWSServiceOrganizations + AWSServiceQldb + AWSServiceQuicksight + AWSServiceRam + AWSServiceRds + AWSServiceRedshift + AWSServiceResiliencehub + AWSServiceResourcegroups + AWSServiceRoute53 + AWSServiceRoute53domains + AWSServiceRoute53recoverycontrolconfig + AWSServiceRoute53recoveryreadiness + AWSServiceRoute53resolver + AWSServiceS3 + AWSServiceS3control + AWSServiceSagemaker + AWSServiceSavingsplans + AWSServiceScheduler + AWSServiceSecretsmanager + AWSServiceSecurityhub + AWSServiceServicecatalog + AWSServiceServicecatalogappregistry + AWSServiceServicediscovery + AWSServiceServicequotas + AWSServiceSes + AWSServiceSesv2 + AWSServiceSfn + AWSServiceShield + AWSServiceSigner + AWSServiceSns + AWSServiceSqs + AWSServiceSsm + AWSServiceSsoadmin + AWSServiceSupport + AWSServiceTimestreamwrite + AWSServiceTransfer + AWSServiceWaf + AWSServiceWafregional + AWSServiceWafv2 + AWSServiceWellarchitected + AWSServiceWorkspaces + AWSServiceXray +) + +type AWSServiceName int + +func (s *AWSServiceName) String() string { + if s == nil { + return "" + } + return AllAWSServiceNames[*s] +} + +var AllAWSServiceNames = [...]string{ + AWSServiceAccessanalyzer: "accessanalyzer", + AWSServiceAccount: "account", + AWSServiceAcm: "acm", + AWSServiceAcmpca: "acmpca", + AWSServiceAmp: "amp", + AWSServiceAmplify: "amplify", + AWSServiceApigateway: "apigateway", + AWSServiceApigatewayv2: "apigatewayv2", + AWSServiceAppconfig: "appconfig", + AWSServiceAppflow: "appflow", + AWSServiceApplicationautoscaling: "applicationautoscaling", + AWSServiceAppmesh: "appmesh", + AWSServiceApprunner: "apprunner", + AWSServiceAppstream: "appstream", + AWSServiceAppsync: "appsync", + AWSServiceAthena: "athena", + AWSServiceAuditmanager: "auditmanager", + AWSServiceAutoscaling: "autoscaling", + AWSServiceAutoscalingplans: "autoscalingplans", + AWSServiceBackup: "backup", + AWSServiceBatch: "batch", + AWSServiceCloudformation: "cloudformation", + AWSServiceCloudfront: "cloudfront", + AWSServiceCloudhsmv2: "cloudhsmv2", + AWSServiceCloudtrail: "cloudtrail", + AWSServiceCloudwatch: "cloudwatch", + AWSServiceCloudwatchlogs: "cloudwatchlogs", + AWSServiceCodeartifact: "codeartifact", + AWSServiceCodebuild: "codebuild", + AWSServiceCodecommit: "codecommit", + AWSServiceCodepipeline: "codepipeline", + AWSServiceCognitoidentity: "cognitoidentity", + AWSServiceCognitoidentityprovider: "cognitoidentityprovider", + AWSServiceComputeoptimizer: "computeoptimizer", + AWSServiceConfigservice: "configservice", + AWSServiceCostexplorer: "costexplorer", + AWSServiceDatabasemigrationservice: "databasemigrationservice", + AWSServiceDax: "dax", + AWSServiceDetective: "detective", + AWSServiceDirectconnect: "directconnect", + AWSServiceDocdb: "docdb", + AWSServiceDynamodb: "dynamodb", + AWSServiceDynamodbstreams: "dynamodbstreams", + AWSServiceEc2: "ec2", + AWSServiceEcr: "ecr", + AWSServiceEcrpublic: "ecrpublic", + AWSServiceEcs: "ecs", + AWSServiceEfs: "efs", + AWSServiceEks: "eks", + AWSServiceElasticache: "elasticache", + AWSServiceElasticbeanstalk: "elasticbeanstalk", + AWSServiceElasticloadbalancing: "elasticloadbalancing", + AWSServiceElasticloadbalancingv2: "elasticloadbalancingv2", + AWSServiceElasticsearchservice: "elasticsearchservice", + AWSServiceElastictranscoder: "elastictranscoder", + AWSServiceEmr: "emr", + AWSServiceEventbridge: "eventbridge", + AWSServiceFirehose: "firehose", + AWSServiceFrauddetector: "frauddetector", + AWSServiceFsx: "fsx", + AWSServiceGlacier: "glacier", + AWSServiceGlue: "glue", + AWSServiceGuardduty: "guardduty", + AWSServiceIam: "iam", + AWSServiceIdentitystore: "identitystore", + AWSServiceInspector: "inspector", + AWSServiceInspector2: "inspector2", + AWSServiceIot: "iot", + AWSServiceKafka: "kafka", + AWSServiceKinesis: "kinesis", + AWSServiceKms: "kms", + AWSServiceLambda: "lambda", + AWSServiceLightsail: "lightsail", + AWSServiceMq: "mq", + AWSServiceMwaa: "mwaa", + AWSServiceNeptune: "neptune", + AWSServiceNetworkfirewall: "networkfirewall", + AWSServiceNetworkmanager: "networkmanager", + AWSServiceOrganizations: "organizations", + AWSServiceQldb: "qldb", + AWSServiceQuicksight: "quicksight", + AWSServiceRam: "ram", + AWSServiceRds: "rds", + AWSServiceRedshift: "redshift", + AWSServiceResiliencehub: "resiliencehub", + AWSServiceResourcegroups: "resourcegroups", + AWSServiceRoute53: "route53", + AWSServiceRoute53domains: "route53domains", + AWSServiceRoute53recoverycontrolconfig: "route53recoverycontrolconfig", + AWSServiceRoute53recoveryreadiness: "route53recoveryreadiness", + AWSServiceRoute53resolver: "route53resolver", + AWSServiceS3: "s3", + AWSServiceS3control: "s3control", + AWSServiceSagemaker: "sagemaker", + AWSServiceSavingsplans: "savingsplans", + AWSServiceScheduler: "scheduler", + AWSServiceSecretsmanager: "secretsmanager", + AWSServiceSecurityhub: "securityhub", + AWSServiceServicecatalog: "servicecatalog", + AWSServiceServicecatalogappregistry: "servicecatalogappregistry", + AWSServiceServicediscovery: "servicediscovery", + AWSServiceServicequotas: "servicequotas", + AWSServiceSes: "ses", + AWSServiceSesv2: "sesv2", + AWSServiceSfn: "sfn", + AWSServiceShield: "shield", + AWSServiceSigner: "signer", + AWSServiceSns: "sns", + AWSServiceSqs: "sqs", + AWSServiceSsm: "ssm", + AWSServiceSsoadmin: "ssoadmin", + AWSServiceSupport: "support", + AWSServiceTimestreamwrite: "timestreamwrite", + AWSServiceTransfer: "transfer", + AWSServiceWaf: "waf", + AWSServiceWafregional: "wafregional", + AWSServiceWafv2: "wafv2", + AWSServiceWellarchitected: "wellarchitected", + AWSServiceWorkspaces: "workspaces", + AWSServiceXray: "xray", +} diff --git a/plugins/source/aws/client/services.go b/plugins/source/aws/client/services.go index 87c64adb3a01de..2a9e31b9be996f 100644 --- a/plugins/source/aws/client/services.go +++ b/plugins/source/aws/client/services.go @@ -125,130 +125,9 @@ import ( "github.com/cloudquery/cloudquery/plugins/source/aws/client/services" ) -func initServices(c aws.Config, regions []string) Services { - awsCfg := c.Copy() +func initServices(_ aws.Config, regions []string) Services { return Services{ - Regions: regions, - Accessanalyzer: accessanalyzer.NewFromConfig(awsCfg), - Account: account.NewFromConfig(awsCfg), - Acm: acm.NewFromConfig(awsCfg), - Acmpca: acmpca.NewFromConfig(awsCfg), - Amp: amp.NewFromConfig(awsCfg), - Amplify: amplify.NewFromConfig(awsCfg), - Apigateway: apigateway.NewFromConfig(awsCfg), - Apigatewayv2: apigatewayv2.NewFromConfig(awsCfg), - Appconfig: appconfig.NewFromConfig(awsCfg), - Appflow: appflow.NewFromConfig(awsCfg), - Applicationautoscaling: applicationautoscaling.NewFromConfig(awsCfg), - Appmesh: appmesh.NewFromConfig(awsCfg), - Apprunner: apprunner.NewFromConfig(awsCfg), - Appstream: appstream.NewFromConfig(awsCfg), - Appsync: appsync.NewFromConfig(awsCfg), - Athena: athena.NewFromConfig(awsCfg), - Auditmanager: auditmanager.NewFromConfig(awsCfg), - Autoscaling: autoscaling.NewFromConfig(awsCfg), - Autoscalingplans: autoscalingplans.NewFromConfig(awsCfg), - Batch: batch.NewFromConfig(awsCfg), - Backup: backup.NewFromConfig(awsCfg), - Cloudformation: cloudformation.NewFromConfig(awsCfg), - Cloudfront: cloudfront.NewFromConfig(awsCfg), - Cloudhsmv2: cloudhsmv2.NewFromConfig(awsCfg), - Cloudtrail: cloudtrail.NewFromConfig(awsCfg), - Cloudwatch: cloudwatch.NewFromConfig(awsCfg), - Cloudwatchlogs: cloudwatchlogs.NewFromConfig(awsCfg), - Codeartifact: codeartifact.NewFromConfig(awsCfg), - Codebuild: codebuild.NewFromConfig(awsCfg), - Codecommit: codecommit.NewFromConfig(awsCfg), - Codepipeline: codepipeline.NewFromConfig(awsCfg), - Cognitoidentity: cognitoidentity.NewFromConfig(awsCfg), - Cognitoidentityprovider: cognitoidentityprovider.NewFromConfig(awsCfg), - Computeoptimizer: computeoptimizer.NewFromConfig(awsCfg), - Configservice: configservice.NewFromConfig(awsCfg), - Costexplorer: costexplorer.NewFromConfig(awsCfg), - Databasemigrationservice: databasemigrationservice.NewFromConfig(awsCfg), - Dax: dax.NewFromConfig(awsCfg), - Directconnect: directconnect.NewFromConfig(awsCfg), - Detective: detective.NewFromConfig(awsCfg), - Docdb: docdb.NewFromConfig(awsCfg), - Dynamodb: dynamodb.NewFromConfig(awsCfg), - Dynamodbstreams: dynamodbstreams.NewFromConfig(awsCfg), - Ec2: ec2.NewFromConfig(awsCfg), - Ecr: ecr.NewFromConfig(awsCfg), - Ecrpublic: ecrpublic.NewFromConfig(awsCfg), - Ecs: ecs.NewFromConfig(awsCfg), - Efs: efs.NewFromConfig(awsCfg), - Eks: eks.NewFromConfig(awsCfg), - Elasticache: elasticache.NewFromConfig(awsCfg), - Elasticbeanstalk: elasticbeanstalk.NewFromConfig(awsCfg), - Elasticloadbalancing: elasticloadbalancing.NewFromConfig(awsCfg), - Elasticloadbalancingv2: elasticloadbalancingv2.NewFromConfig(awsCfg), - Elasticsearchservice: elasticsearchservice.NewFromConfig(awsCfg), - Elastictranscoder: elastictranscoder.NewFromConfig(awsCfg), - Emr: emr.NewFromConfig(awsCfg), - Eventbridge: eventbridge.NewFromConfig(awsCfg), - Firehose: firehose.NewFromConfig(awsCfg), - Frauddetector: frauddetector.NewFromConfig(awsCfg), - Fsx: fsx.NewFromConfig(awsCfg), - Glacier: glacier.NewFromConfig(awsCfg), - Glue: glue.NewFromConfig(awsCfg), - Guardduty: guardduty.NewFromConfig(awsCfg), - Iam: iam.NewFromConfig(awsCfg), - Identitystore: identitystore.NewFromConfig(awsCfg), - Inspector: inspector.NewFromConfig(awsCfg), - Inspector2: inspector2.NewFromConfig(awsCfg), - Iot: iot.NewFromConfig(awsCfg), - Kafka: kafka.NewFromConfig(awsCfg), - Kinesis: kinesis.NewFromConfig(awsCfg), - Kms: kms.NewFromConfig(awsCfg), - Lambda: lambda.NewFromConfig(awsCfg), - Lightsail: lightsail.NewFromConfig(awsCfg), - Mq: mq.NewFromConfig(awsCfg), - Mwaa: mwaa.NewFromConfig(awsCfg), - Neptune: neptune.NewFromConfig(awsCfg), - Networkfirewall: networkfirewall.NewFromConfig(awsCfg), - Networkmanager: networkmanager.NewFromConfig(awsCfg), - Organizations: organizations.NewFromConfig(awsCfg), - Qldb: qldb.NewFromConfig(awsCfg), - Quicksight: quicksight.NewFromConfig(awsCfg), - Ram: ram.NewFromConfig(awsCfg), - Rds: rds.NewFromConfig(awsCfg), - Redshift: redshift.NewFromConfig(awsCfg), - Resiliencehub: resiliencehub.NewFromConfig(awsCfg), - Resourcegroups: resourcegroups.NewFromConfig(awsCfg), - Route53: route53.NewFromConfig(awsCfg), - Route53domains: route53domains.NewFromConfig(awsCfg), - Route53recoverycontrolconfig: route53recoverycontrolconfig.NewFromConfig(awsCfg), - Route53recoveryreadiness: route53recoveryreadiness.NewFromConfig(awsCfg), - Route53resolver: route53resolver.NewFromConfig(awsCfg), - S3: s3.NewFromConfig(awsCfg), - S3control: s3control.NewFromConfig(awsCfg), - Sagemaker: sagemaker.NewFromConfig(awsCfg), - Savingsplans: savingsplans.NewFromConfig(awsCfg), - Scheduler: scheduler.NewFromConfig(awsCfg), - Secretsmanager: secretsmanager.NewFromConfig(awsCfg), - Securityhub: securityhub.NewFromConfig(awsCfg), - Servicecatalog: servicecatalog.NewFromConfig(awsCfg), - Servicecatalogappregistry: servicecatalogappregistry.NewFromConfig(awsCfg), - Servicediscovery: servicediscovery.NewFromConfig(awsCfg), - Servicequotas: servicequotas.NewFromConfig(awsCfg), - Ses: ses.NewFromConfig(awsCfg), - Sesv2: sesv2.NewFromConfig(awsCfg), - Sfn: sfn.NewFromConfig(awsCfg), - Shield: shield.NewFromConfig(awsCfg), - Signer: signer.NewFromConfig(awsCfg), - Sns: sns.NewFromConfig(awsCfg), - Sqs: sqs.NewFromConfig(awsCfg), - Ssm: ssm.NewFromConfig(awsCfg), - Ssoadmin: ssoadmin.NewFromConfig(awsCfg), - Support: support.NewFromConfig(awsCfg), - Timestreamwrite: timestreamwrite.NewFromConfig(awsCfg), - Transfer: transfer.NewFromConfig(awsCfg), - Waf: waf.NewFromConfig(awsCfg), - Wafregional: wafregional.NewFromConfig(awsCfg), - Wafv2: wafv2.NewFromConfig(awsCfg), - Wellarchitected: wellarchitected.NewFromConfig(awsCfg), - Workspaces: workspaces.NewFromConfig(awsCfg), - Xray: xray.NewFromConfig(awsCfg), + Regions: regions, } } @@ -375,3 +254,498 @@ type Services struct { Workspaces services.WorkspacesClient Xray services.XrayClient } + +func (s *Services) InitService(awsConfig *aws.Config, service AWSServiceName) { + c := awsConfig.Copy() + switch service { + case AWSServiceAccessanalyzer: + s.Accessanalyzer = accessanalyzer.NewFromConfig(c) + case AWSServiceAccount: + s.Account = account.NewFromConfig(c) + case AWSServiceAcm: + s.Acm = acm.NewFromConfig(c) + case AWSServiceAcmpca: + s.Acmpca = acmpca.NewFromConfig(c) + case AWSServiceAmp: + s.Amp = amp.NewFromConfig(c) + case AWSServiceAmplify: + s.Amplify = amplify.NewFromConfig(c) + case AWSServiceApigateway: + s.Apigateway = apigateway.NewFromConfig(c) + case AWSServiceApigatewayv2: + s.Apigatewayv2 = apigatewayv2.NewFromConfig(c) + case AWSServiceAppconfig: + s.Appconfig = appconfig.NewFromConfig(c) + case AWSServiceAppflow: + s.Appflow = appflow.NewFromConfig(c) + case AWSServiceApplicationautoscaling: + s.Applicationautoscaling = applicationautoscaling.NewFromConfig(c) + case AWSServiceAppmesh: + s.Appmesh = appmesh.NewFromConfig(c) + case AWSServiceApprunner: + s.Apprunner = apprunner.NewFromConfig(c) + case AWSServiceAppstream: + s.Appstream = appstream.NewFromConfig(c) + case AWSServiceAppsync: + s.Appsync = appsync.NewFromConfig(c) + case AWSServiceAthena: + s.Athena = athena.NewFromConfig(c) + case AWSServiceAuditmanager: + s.Auditmanager = auditmanager.NewFromConfig(c) + case AWSServiceAutoscaling: + s.Autoscaling = autoscaling.NewFromConfig(c) + case AWSServiceAutoscalingplans: + s.Autoscalingplans = autoscalingplans.NewFromConfig(c) + case AWSServiceBackup: + s.Backup = backup.NewFromConfig(c) + case AWSServiceBatch: + s.Batch = batch.NewFromConfig(c) + case AWSServiceCloudformation: + s.Cloudformation = cloudformation.NewFromConfig(c) + case AWSServiceCloudfront: + s.Cloudfront = cloudfront.NewFromConfig(c) + case AWSServiceCloudhsmv2: + s.Cloudhsmv2 = cloudhsmv2.NewFromConfig(c) + case AWSServiceCloudtrail: + s.Cloudtrail = cloudtrail.NewFromConfig(c) + case AWSServiceCloudwatch: + s.Cloudwatch = cloudwatch.NewFromConfig(c) + case AWSServiceCloudwatchlogs: + s.Cloudwatchlogs = cloudwatchlogs.NewFromConfig(c) + case AWSServiceCodeartifact: + s.Codeartifact = codeartifact.NewFromConfig(c) + case AWSServiceCodebuild: + s.Codebuild = codebuild.NewFromConfig(c) + case AWSServiceCodecommit: + s.Codecommit = codecommit.NewFromConfig(c) + case AWSServiceCodepipeline: + s.Codepipeline = codepipeline.NewFromConfig(c) + case AWSServiceCognitoidentity: + s.Cognitoidentity = cognitoidentity.NewFromConfig(c) + case AWSServiceCognitoidentityprovider: + s.Cognitoidentityprovider = cognitoidentityprovider.NewFromConfig(c) + case AWSServiceComputeoptimizer: + s.Computeoptimizer = computeoptimizer.NewFromConfig(c) + case AWSServiceConfigservice: + s.Configservice = configservice.NewFromConfig(c) + case AWSServiceCostexplorer: + s.Costexplorer = costexplorer.NewFromConfig(c) + case AWSServiceDatabasemigrationservice: + s.Databasemigrationservice = databasemigrationservice.NewFromConfig(c) + case AWSServiceDax: + s.Dax = dax.NewFromConfig(c) + case AWSServiceDetective: + s.Detective = detective.NewFromConfig(c) + case AWSServiceDirectconnect: + s.Directconnect = directconnect.NewFromConfig(c) + case AWSServiceDocdb: + s.Docdb = docdb.NewFromConfig(c) + case AWSServiceDynamodb: + s.Dynamodb = dynamodb.NewFromConfig(c) + case AWSServiceDynamodbstreams: + s.Dynamodbstreams = dynamodbstreams.NewFromConfig(c) + case AWSServiceEc2: + s.Ec2 = ec2.NewFromConfig(c) + case AWSServiceEcr: + s.Ecr = ecr.NewFromConfig(c) + case AWSServiceEcrpublic: + s.Ecrpublic = ecrpublic.NewFromConfig(c) + case AWSServiceEcs: + s.Ecs = ecs.NewFromConfig(c) + case AWSServiceEfs: + s.Efs = efs.NewFromConfig(c) + case AWSServiceEks: + s.Eks = eks.NewFromConfig(c) + case AWSServiceElasticache: + s.Elasticache = elasticache.NewFromConfig(c) + case AWSServiceElasticbeanstalk: + s.Elasticbeanstalk = elasticbeanstalk.NewFromConfig(c) + case AWSServiceElasticloadbalancing: + s.Elasticloadbalancing = elasticloadbalancing.NewFromConfig(c) + case AWSServiceElasticloadbalancingv2: + s.Elasticloadbalancingv2 = elasticloadbalancingv2.NewFromConfig(c) + case AWSServiceElasticsearchservice: + s.Elasticsearchservice = elasticsearchservice.NewFromConfig(c) + case AWSServiceElastictranscoder: + s.Elastictranscoder = elastictranscoder.NewFromConfig(c) + case AWSServiceEmr: + s.Emr = emr.NewFromConfig(c) + case AWSServiceEventbridge: + s.Eventbridge = eventbridge.NewFromConfig(c) + case AWSServiceFirehose: + s.Firehose = firehose.NewFromConfig(c) + case AWSServiceFrauddetector: + s.Frauddetector = frauddetector.NewFromConfig(c) + case AWSServiceFsx: + s.Fsx = fsx.NewFromConfig(c) + case AWSServiceGlacier: + s.Glacier = glacier.NewFromConfig(c) + case AWSServiceGlue: + s.Glue = glue.NewFromConfig(c) + case AWSServiceGuardduty: + s.Guardduty = guardduty.NewFromConfig(c) + case AWSServiceIam: + s.Iam = iam.NewFromConfig(c) + case AWSServiceIdentitystore: + s.Identitystore = identitystore.NewFromConfig(c) + case AWSServiceInspector: + s.Inspector = inspector.NewFromConfig(c) + case AWSServiceInspector2: + s.Inspector2 = inspector2.NewFromConfig(c) + case AWSServiceIot: + s.Iot = iot.NewFromConfig(c) + case AWSServiceKafka: + s.Kafka = kafka.NewFromConfig(c) + case AWSServiceKinesis: + s.Kinesis = kinesis.NewFromConfig(c) + case AWSServiceKms: + s.Kms = kms.NewFromConfig(c) + case AWSServiceLambda: + s.Lambda = lambda.NewFromConfig(c) + case AWSServiceLightsail: + s.Lightsail = lightsail.NewFromConfig(c) + case AWSServiceMq: + s.Mq = mq.NewFromConfig(c) + case AWSServiceMwaa: + s.Mwaa = mwaa.NewFromConfig(c) + case AWSServiceNeptune: + s.Neptune = neptune.NewFromConfig(c) + case AWSServiceNetworkfirewall: + s.Networkfirewall = networkfirewall.NewFromConfig(c) + case AWSServiceNetworkmanager: + s.Networkmanager = networkmanager.NewFromConfig(c) + case AWSServiceOrganizations: + s.Organizations = organizations.NewFromConfig(c) + case AWSServiceQldb: + s.Qldb = qldb.NewFromConfig(c) + case AWSServiceQuicksight: + s.Quicksight = quicksight.NewFromConfig(c) + case AWSServiceRam: + s.Ram = ram.NewFromConfig(c) + case AWSServiceRds: + s.Rds = rds.NewFromConfig(c) + case AWSServiceRedshift: + s.Redshift = redshift.NewFromConfig(c) + case AWSServiceResiliencehub: + s.Resiliencehub = resiliencehub.NewFromConfig(c) + case AWSServiceResourcegroups: + s.Resourcegroups = resourcegroups.NewFromConfig(c) + case AWSServiceRoute53: + s.Route53 = route53.NewFromConfig(c) + case AWSServiceRoute53domains: + s.Route53domains = route53domains.NewFromConfig(c) + case AWSServiceRoute53recoverycontrolconfig: + s.Route53recoverycontrolconfig = route53recoverycontrolconfig.NewFromConfig(c) + case AWSServiceRoute53recoveryreadiness: + s.Route53recoveryreadiness = route53recoveryreadiness.NewFromConfig(c) + case AWSServiceRoute53resolver: + s.Route53resolver = route53resolver.NewFromConfig(c) + case AWSServiceS3: + s.S3 = s3.NewFromConfig(c) + case AWSServiceS3control: + s.S3control = s3control.NewFromConfig(c) + case AWSServiceSagemaker: + s.Sagemaker = sagemaker.NewFromConfig(c) + case AWSServiceSavingsplans: + s.Savingsplans = savingsplans.NewFromConfig(c) + case AWSServiceScheduler: + s.Scheduler = scheduler.NewFromConfig(c) + case AWSServiceSecretsmanager: + s.Secretsmanager = secretsmanager.NewFromConfig(c) + case AWSServiceSecurityhub: + s.Securityhub = securityhub.NewFromConfig(c) + case AWSServiceServicecatalog: + s.Servicecatalog = servicecatalog.NewFromConfig(c) + case AWSServiceServicecatalogappregistry: + s.Servicecatalogappregistry = servicecatalogappregistry.NewFromConfig(c) + case AWSServiceServicediscovery: + s.Servicediscovery = servicediscovery.NewFromConfig(c) + case AWSServiceServicequotas: + s.Servicequotas = servicequotas.NewFromConfig(c) + case AWSServiceSes: + s.Ses = ses.NewFromConfig(c) + case AWSServiceSesv2: + s.Sesv2 = sesv2.NewFromConfig(c) + case AWSServiceSfn: + s.Sfn = sfn.NewFromConfig(c) + case AWSServiceShield: + s.Shield = shield.NewFromConfig(c) + case AWSServiceSigner: + s.Signer = signer.NewFromConfig(c) + case AWSServiceSns: + s.Sns = sns.NewFromConfig(c) + case AWSServiceSqs: + s.Sqs = sqs.NewFromConfig(c) + case AWSServiceSsm: + s.Ssm = ssm.NewFromConfig(c) + case AWSServiceSsoadmin: + s.Ssoadmin = ssoadmin.NewFromConfig(c) + case AWSServiceSupport: + s.Support = support.NewFromConfig(c) + case AWSServiceTimestreamwrite: + s.Timestreamwrite = timestreamwrite.NewFromConfig(c) + case AWSServiceTransfer: + s.Transfer = transfer.NewFromConfig(c) + case AWSServiceWaf: + s.Waf = waf.NewFromConfig(c) + case AWSServiceWafv2: + s.Wafv2 = wafv2.NewFromConfig(c) + case AWSServiceWafregional: + s.Wafregional = wafregional.NewFromConfig(c) + case AWSServiceWellarchitected: + s.Wellarchitected = wellarchitected.NewFromConfig(c) + case AWSServiceWorkspaces: + s.Workspaces = workspaces.NewFromConfig(c) + case AWSServiceXray: + s.Xray = xray.NewFromConfig(c) + default: + panic("unknown service: " + service.String()) + } +} + +func (s *Services) GetService(service AWSServiceName) any { + switch service { + case AWSServiceAccessanalyzer: + return s.Accessanalyzer + case AWSServiceAccount: + return s.Account + case AWSServiceAcm: + return s.Acm + case AWSServiceAcmpca: + return s.Acmpca + case AWSServiceAmp: + return s.Amp + case AWSServiceAmplify: + return s.Amplify + case AWSServiceApigateway: + return s.Apigateway + case AWSServiceApigatewayv2: + return s.Apigatewayv2 + case AWSServiceAppconfig: + return s.Appconfig + case AWSServiceAppflow: + return s.Appflow + case AWSServiceApplicationautoscaling: + return s.Applicationautoscaling + case AWSServiceAppmesh: + return s.Appmesh + case AWSServiceApprunner: + return s.Apprunner + case AWSServiceAppstream: + return s.Appstream + case AWSServiceAppsync: + return s.Appsync + case AWSServiceAthena: + return s.Athena + case AWSServiceAuditmanager: + return s.Auditmanager + case AWSServiceAutoscaling: + return s.Autoscaling + case AWSServiceAutoscalingplans: + return s.Autoscalingplans + case AWSServiceBackup: + return s.Backup + case AWSServiceBatch: + return s.Batch + case AWSServiceCloudformation: + return s.Cloudformation + case AWSServiceCloudfront: + return s.Cloudfront + case AWSServiceCloudhsmv2: + return s.Cloudhsmv2 + case AWSServiceCloudtrail: + return s.Cloudtrail + case AWSServiceCloudwatch: + return s.Cloudwatch + case AWSServiceCloudwatchlogs: + return s.Cloudwatchlogs + case AWSServiceCodeartifact: + return s.Codeartifact + case AWSServiceCodebuild: + return s.Codebuild + case AWSServiceCodecommit: + return s.Codecommit + case AWSServiceCodepipeline: + return s.Codepipeline + case AWSServiceCognitoidentity: + return s.Cognitoidentity + case AWSServiceCognitoidentityprovider: + return s.Cognitoidentityprovider + case AWSServiceComputeoptimizer: + return s.Computeoptimizer + case AWSServiceConfigservice: + return s.Configservice + case AWSServiceCostexplorer: + return s.Costexplorer + case AWSServiceDatabasemigrationservice: + return s.Databasemigrationservice + case AWSServiceDax: + return s.Dax + case AWSServiceDetective: + return s.Detective + case AWSServiceDirectconnect: + return s.Directconnect + case AWSServiceDocdb: + return s.Docdb + case AWSServiceDynamodb: + return s.Dynamodb + case AWSServiceDynamodbstreams: + return s.Dynamodbstreams + case AWSServiceEc2: + return s.Ec2 + case AWSServiceEcr: + return s.Ecr + case AWSServiceEcrpublic: + return s.Ecrpublic + case AWSServiceEcs: + return s.Ecs + case AWSServiceEfs: + return s.Efs + case AWSServiceEks: + return s.Eks + case AWSServiceElasticache: + return s.Elasticache + case AWSServiceElasticbeanstalk: + return s.Elasticbeanstalk + case AWSServiceElasticloadbalancing: + return s.Elasticloadbalancing + case AWSServiceElasticloadbalancingv2: + return s.Elasticloadbalancingv2 + case AWSServiceElasticsearchservice: + return s.Elasticsearchservice + case AWSServiceElastictranscoder: + return s.Elastictranscoder + case AWSServiceEmr: + return s.Emr + case AWSServiceEventbridge: + return s.Eventbridge + case AWSServiceFirehose: + return s.Firehose + case AWSServiceFrauddetector: + return s.Frauddetector + case AWSServiceFsx: + return s.Fsx + case AWSServiceGlacier: + return s.Glacier + case AWSServiceGlue: + return s.Glue + case AWSServiceGuardduty: + return s.Guardduty + case AWSServiceIam: + return s.Iam + case AWSServiceIdentitystore: + return s.Identitystore + case AWSServiceInspector: + return s.Inspector + case AWSServiceInspector2: + return s.Inspector2 + case AWSServiceIot: + return s.Iot + case AWSServiceKafka: + return s.Kafka + case AWSServiceKinesis: + return s.Kinesis + case AWSServiceKms: + return s.Kms + case AWSServiceLambda: + return s.Lambda + case AWSServiceLightsail: + return s.Lightsail + case AWSServiceMq: + return s.Mq + case AWSServiceMwaa: + return s.Mwaa + case AWSServiceNeptune: + return s.Neptune + case AWSServiceNetworkfirewall: + return s.Networkfirewall + case AWSServiceNetworkmanager: + return s.Networkmanager + case AWSServiceOrganizations: + return s.Organizations + case AWSServiceQldb: + return s.Qldb + case AWSServiceQuicksight: + return s.Quicksight + case AWSServiceRam: + return s.Ram + case AWSServiceRds: + return s.Rds + case AWSServiceRedshift: + return s.Redshift + case AWSServiceResiliencehub: + return s.Resiliencehub + case AWSServiceResourcegroups: + return s.Resourcegroups + case AWSServiceRoute53: + return s.Route53 + case AWSServiceRoute53domains: + return s.Route53domains + case AWSServiceRoute53recoverycontrolconfig: + return s.Route53recoverycontrolconfig + case AWSServiceRoute53recoveryreadiness: + return s.Route53recoveryreadiness + case AWSServiceRoute53resolver: + return s.Route53resolver + case AWSServiceS3: + return s.S3 + case AWSServiceS3control: + return s.S3control + case AWSServiceSagemaker: + return s.Sagemaker + case AWSServiceSavingsplans: + return s.Savingsplans + case AWSServiceScheduler: + return s.Scheduler + case AWSServiceSecretsmanager: + return s.Secretsmanager + case AWSServiceSecurityhub: + return s.Securityhub + case AWSServiceServicecatalog: + return s.Servicecatalog + case AWSServiceServicecatalogappregistry: + return s.Servicecatalogappregistry + case AWSServiceServicediscovery: + return s.Servicediscovery + case AWSServiceServicequotas: + return s.Servicequotas + case AWSServiceSes: + return s.Ses + case AWSServiceSesv2: + return s.Sesv2 + case AWSServiceSfn: + return s.Sfn + case AWSServiceShield: + return s.Shield + case AWSServiceSigner: + return s.Signer + case AWSServiceSns: + return s.Sns + case AWSServiceSqs: + return s.Sqs + case AWSServiceSsm: + return s.Ssm + case AWSServiceSsoadmin: + return s.Ssoadmin + case AWSServiceSupport: + return s.Support + case AWSServiceTimestreamwrite: + return s.Timestreamwrite + case AWSServiceTransfer: + return s.Transfer + case AWSServiceWaf: + return s.Waf + case AWSServiceWafv2: + return s.Wafv2 + case AWSServiceWafregional: + return s.Wafregional + case AWSServiceWellarchitected: + return s.Wellarchitected + case AWSServiceWorkspaces: + return s.Workspaces + case AWSServiceXray: + return s.Xray + default: + panic("unknown service: " + service.String()) + } +} diff --git a/plugins/source/aws/client/testing.go b/plugins/source/aws/client/testing.go index 06fa6efd72ad5d..079ec0f65dadf7 100644 --- a/plugins/source/aws/client/testing.go +++ b/plugins/source/aws/client/testing.go @@ -3,6 +3,7 @@ package client import ( "context" "os" + "sync" "testing" "time" @@ -40,6 +41,7 @@ func AwsMockTestHelper(t *testing.T, parentTable *schema.Table, builder func(*te c := NewAwsClient(l, &awsSpec) services := builder(t, ctrl) services.Regions = []string{testOpts.Region} + c.accountMutex["testAccount"] = &sync.Mutex{} c.ServicesManager.InitServicesForPartitionAccount("aws", "testAccount", services) c.Partition = "aws" tables := schema.Tables{parentTable} diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go b/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go index 39ee53a475d793..6775bc61f55be9 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_archive_rules.go @@ -32,7 +32,7 @@ func analyzerArchiveRules() *schema.Table { func fetchAccessanalyzerAnalyzerArchiveRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { analyzer := parent.Item.(types.AnalyzerSummary) cl := meta.(*client.Client) - svc := cl.Services().Accessanalyzer + svc := cl.Services(client.AWSServiceAccessanalyzer).Accessanalyzer config := accessanalyzer.ListArchiveRulesInput{ AnalyzerName: analyzer.Name, } diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go index 2479a03dd5c7b0..472909a6ad72f9 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzer_findings.go @@ -41,7 +41,7 @@ func analyzerFindings() *schema.Table { func fetchAccessanalyzerAnalyzerFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { analyzer := parent.Item.(types.AnalyzerSummary) cl := meta.(*client.Client) - svc := cl.Services().Accessanalyzer + svc := cl.Services(client.AWSServiceAccessanalyzer).Accessanalyzer allConfigs := []tableoptions.CustomAccessAnalyzerListFindingsInput{{}} if cl.Spec.TableOptions.AccessAnalyzerFindings != nil { allConfigs = cl.Spec.TableOptions.AccessAnalyzerFindings.ListFindingOpts diff --git a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go index e96c0b6d327619..e0918217fe1141 100644 --- a/plugins/source/aws/resources/services/accessanalyzer/analyzers.go +++ b/plugins/source/aws/resources/services/accessanalyzer/analyzers.go @@ -38,7 +38,7 @@ func Analyzers() *schema.Table { func fetchAccessanalyzerAnalyzers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Accessanalyzer + svc := cl.Services(client.AWSServiceAccessanalyzer).Accessanalyzer paginator := accessanalyzer.NewListAnalyzersPaginator(svc, &accessanalyzer.ListAnalyzersInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *accessanalyzer.Options) { diff --git a/plugins/source/aws/resources/services/account/alternate_contacts.go b/plugins/source/aws/resources/services/account/alternate_contacts.go index 1c3e72a1324e48..98a1c5e46dea06 100644 --- a/plugins/source/aws/resources/services/account/alternate_contacts.go +++ b/plugins/source/aws/resources/services/account/alternate_contacts.go @@ -33,7 +33,7 @@ func AlternateContacts() *schema.Table { func fetchAccountAlternateContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Account + svc := cl.Services(client.AWSServiceAccount).Account var contactTypes types.AlternateContactType for _, acType := range contactTypes.Values() { var input account.GetAlternateContactInput diff --git a/plugins/source/aws/resources/services/account/contacts.go b/plugins/source/aws/resources/services/account/contacts.go index a12cc81c02e22a..bc5cc1e7a94504 100644 --- a/plugins/source/aws/resources/services/account/contacts.go +++ b/plugins/source/aws/resources/services/account/contacts.go @@ -26,7 +26,7 @@ func Contacts() *schema.Table { func fetchAccountContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Account + svc := cl.Services(client.AWSServiceAccount).Account var input account.GetContactInformationInput output, err := svc.GetContactInformation(ctx, &input, func(options *account.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/acm/certificates.go b/plugins/source/aws/resources/services/acm/certificates.go index 5ee266fa7bb5f7..dec4422446908b 100644 --- a/plugins/source/aws/resources/services/acm/certificates.go +++ b/plugins/source/aws/resources/services/acm/certificates.go @@ -55,7 +55,7 @@ func allowedKeyUsages() []types.KeyUsageName { func fetchAcmCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Acm + svc := cl.Services(client.AWSServiceAcm).Acm input := acm.ListCertificatesInput{ CertificateStatuses: types.CertificateStatus("").Values(), Includes: &types.Filters{ @@ -79,7 +79,7 @@ func fetchAcmCertificates(ctx context.Context, meta schema.ClientMeta, parent *s func getCertificate(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Acm + svc := cl.Services(client.AWSServiceAcm).Acm input := acm.DescribeCertificateInput{CertificateArn: resource.Item.(types.CertificateSummary).CertificateArn} output, err := svc.DescribeCertificate(ctx, &input, func(o *acm.Options) { o.Region = cl.Region }) if err != nil { @@ -92,7 +92,7 @@ func getCertificate(ctx context.Context, meta schema.ClientMeta, resource *schem func resolveCertificateTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cert := resource.Item.(*types.CertificateDetail) cl := meta.(*client.Client) - svc := cl.Services().Acm + svc := cl.Services(client.AWSServiceAcm).Acm out, err := svc.ListTagsForCertificate(ctx, &acm.ListTagsForCertificateInput{CertificateArn: cert.CertificateArn}, func(o *acm.Options) { diff --git a/plugins/source/aws/resources/services/acmpca/certificate_authorities.go b/plugins/source/aws/resources/services/acmpca/certificate_authorities.go index 8d3a6126c06a3a..53ab4dae7f8fb6 100644 --- a/plugins/source/aws/resources/services/acmpca/certificate_authorities.go +++ b/plugins/source/aws/resources/services/acmpca/certificate_authorities.go @@ -40,7 +40,7 @@ func CertificateAuthorities() *schema.Table { func fetchAcmpcaCertificateAuthorities(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Acmpca + svc := cl.Services(client.AWSServiceAcmpca).Acmpca paginator := acmpca.NewListCertificateAuthoritiesPaginator(svc, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(o *acmpca.Options) { @@ -57,7 +57,7 @@ func fetchAcmpcaCertificateAuthorities(ctx context.Context, meta schema.ClientMe func resolveCertificateAuthorityTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { certAuthority := resource.Item.(types.CertificateAuthority) cl := meta.(*client.Client) - svc := cl.Services().Acmpca + svc := cl.Services(client.AWSServiceAcmpca).Acmpca out, err := svc.ListTags(ctx, &acmpca.ListTagsInput{CertificateAuthorityArn: certAuthority.Arn}, func(o *acmpca.Options) { diff --git a/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go b/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go index fa0e392d19a42d..5dee9ec56d4143 100644 --- a/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go +++ b/plugins/source/aws/resources/services/amp/rule_groups_namespaces.go @@ -39,7 +39,7 @@ func ruleGroupsNamespaces() *schema.Table { func fetchAmpRuleGroupsNamespaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp p := amp.NewListRuleGroupsNamespacesPaginator(svc, &.ListRuleGroupsNamespacesInput{ @@ -64,7 +64,7 @@ func fetchAmpRuleGroupsNamespaces(ctx context.Context, meta schema.ClientMeta, p func describeRuleGroupsNamespace(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp out, err := svc.DescribeRuleGroupsNamespace(ctx, &.DescribeRuleGroupsNamespaceInput{WorkspaceId: resource.Parent.Item.(*types.WorkspaceDescription).WorkspaceId}, diff --git a/plugins/source/aws/resources/services/amp/workspaces.go b/plugins/source/aws/resources/services/amp/workspaces.go index b56be7681099ad..e81e3198cba3ed 100644 --- a/plugins/source/aws/resources/services/amp/workspaces.go +++ b/plugins/source/aws/resources/services/amp/workspaces.go @@ -51,7 +51,7 @@ func Workspaces() *schema.Table { func fetchAmpWorkspaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp p := amp.NewListWorkspacesPaginator(svc, &.ListWorkspacesInput{MaxResults: aws.Int32(int32(1000))}) for p.HasMorePages() { @@ -70,7 +70,7 @@ func fetchAmpWorkspaces(ctx context.Context, meta schema.ClientMeta, parent *sch func describeWorkspace(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp out, err := svc.DescribeWorkspace(ctx, &.DescribeWorkspaceInput{WorkspaceId: resource.Item.(types.WorkspaceSummary).WorkspaceId}, @@ -89,7 +89,7 @@ func describeWorkspace(ctx context.Context, meta schema.ClientMeta, resource *sc func describeAlertManagerDefinition(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp out, err := svc.DescribeAlertManagerDefinition(ctx, &.DescribeAlertManagerDefinitionInput{WorkspaceId: resource.Item.(*types.WorkspaceDescription).WorkspaceId}, @@ -106,7 +106,7 @@ func describeAlertManagerDefinition(ctx context.Context, meta schema.ClientMeta, func describeLoggingConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Amp + svc := cl.Services(client.AWSServiceAmp).Amp out, err := svc.DescribeLoggingConfiguration(ctx, &.DescribeLoggingConfigurationInput{WorkspaceId: resource.Item.(*types.WorkspaceDescription).WorkspaceId}, diff --git a/plugins/source/aws/resources/services/amplify/apps.go b/plugins/source/aws/resources/services/amplify/apps.go index 6b2653e7ce2ae7..d411f3ec5116ac 100644 --- a/plugins/source/aws/resources/services/amplify/apps.go +++ b/plugins/source/aws/resources/services/amplify/apps.go @@ -35,7 +35,7 @@ func Apps() *schema.Table { func fetchApps(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Amplify + svc := cl.Services(client.AWSServiceAmplify).Amplify config := amplify.ListAppsInput{ MaxResults: int32(100), diff --git a/plugins/source/aws/resources/services/apigateway/api_keys.go b/plugins/source/aws/resources/services/apigateway/api_keys.go index 8357eb06d8966b..501ecc52c559f6 100644 --- a/plugins/source/aws/resources/services/apigateway/api_keys.go +++ b/plugins/source/aws/resources/services/apigateway/api_keys.go @@ -41,7 +41,7 @@ func fetchApigatewayApiKeys(ctx context.Context, meta schema.ClientMeta, parent Limit: aws.Int32(500), } cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway p := apigateway.NewGetApiKeysPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/client_certificates.go b/plugins/source/aws/resources/services/apigateway/client_certificates.go index 807fa5ebb9fbaa..7aba3b1c13a363 100644 --- a/plugins/source/aws/resources/services/apigateway/client_certificates.go +++ b/plugins/source/aws/resources/services/apigateway/client_certificates.go @@ -38,7 +38,7 @@ func ClientCertificates() *schema.Table { func fetchApigatewayClientCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigateway.GetClientCertificatesInput cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway for p := apigateway.NewGetClientCertificatesPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go b/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go index bd696a2513fbe3..b79811f61b6ae7 100644 --- a/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go +++ b/plugins/source/aws/resources/services/apigateway/domain_name_base_path_mappings.go @@ -42,7 +42,7 @@ func domainNameBasePathMappings() *schema.Table { func fetchApigatewayDomainNameBasePathMappings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.DomainName) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetBasePathMappingsInput{DomainName: r.DomainName, Limit: aws.Int32(500)} for p := apigateway.NewGetBasePathMappingsPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/domain_names.go b/plugins/source/aws/resources/services/apigateway/domain_names.go index dbe0d5fc74b741..4c0156365fa795 100644 --- a/plugins/source/aws/resources/services/apigateway/domain_names.go +++ b/plugins/source/aws/resources/services/apigateway/domain_names.go @@ -41,7 +41,7 @@ func DomainNames() *schema.Table { func fetchApigatewayDomainNames(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigateway.GetDomainNamesInput cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway for p := apigateway.NewGetDomainNamesPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go b/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go index 633904a7487f7f..326c227ede04a9 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_authorizers.go @@ -45,7 +45,7 @@ func restApiAuthorizers() *schema.Table { func fetchApigatewayRestApiAuthorizers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetAuthorizersInput{RestApiId: r.Id, Limit: aws.Int32(500)} // No paginator available for { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go b/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go index 4aa2059cfefe44..11d357d63710aa 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_deployments.go @@ -42,7 +42,7 @@ func restApiDeployments() *schema.Table { func fetchApigatewayRestApiDeployments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetDeploymentsInput{RestApiId: r.Id, Limit: aws.Int32(500)} for p := apigateway.NewGetDeploymentsPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go index e789b962ca2e8d..b076f61f368f15 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_parts.go @@ -42,7 +42,7 @@ func restApiDocumentationParts() *schema.Table { func fetchApigatewayRestApiDocumentationParts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetDocumentationPartsInput{RestApiId: r.Id, Limit: aws.Int32(500)} // No paginator available for { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go index 065f07fe7868c8..9ea9769a521ccc 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_documentation_versions.go @@ -42,7 +42,7 @@ func restApiDocumentationVersions() *schema.Table { func fetchApigatewayRestApiDocumentationVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetDocumentationVersionsInput{RestApiId: r.Id, Limit: aws.Int32(500)} // No paginator available for { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go b/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go index 24c358895391c1..c4fddcfafd92e4 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_gateway_responses.go @@ -41,7 +41,7 @@ func restApiGatewayResponses() *schema.Table { func fetchApigatewayRestApiGatewayResponses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetGatewayResponsesInput{RestApiId: r.Id, Limit: aws.Int32(500)} // No paginator available for { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_models.go b/plugins/source/aws/resources/services/apigateway/rest_api_models.go index b0f04a4cef14c0..602f9e8b423397 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_models.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_models.go @@ -47,7 +47,7 @@ func restApiModels() *schema.Table { func fetchApigatewayRestApiModels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetModelsInput{RestApiId: r.Id, Limit: aws.Int32(500)} for p := apigateway.NewGetModelsPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { @@ -80,7 +80,7 @@ func resolveApigatewayRestAPIModelModelTemplate(ctx context.Context, meta schema r := resource.Item.(types.Model) api := resource.Parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway if api.Id == nil || r.Name == nil { return nil diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go b/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go index 5089bd66f767b6..11d6d3e52ebbd9 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_request_validators.go @@ -42,7 +42,7 @@ func restApiRequestValidators() *schema.Table { func fetchApigatewayRestApiRequestValidators(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetRequestValidatorsInput{RestApiId: r.Id, Limit: aws.Int32(500)} // No paginator available for { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go b/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go index 02e9d252b984df..1692b02f770570 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resource_method_integration.go @@ -55,7 +55,7 @@ func fetchApigatewayRestApiResourceMethodIntegration(ctx context.Context, meta s api := parent.Parent.Parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetIntegrationInput{RestApiId: api.Id, ResourceId: resource.Id, HttpMethod: method.HttpMethod} resp, err := svc.GetIntegration(ctx, &config, func(options *apigateway.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go b/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go index d4bb7ab2672c84..cbc26aaec6c99d 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resource_methods.go @@ -51,7 +51,7 @@ func fetchApigatewayRestApiResourceMethods(ctx context.Context, meta schema.Clie api := parent.Parent.Item.(types.RestApi) resource := parent.Item.(types.Resource) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway for method := range resource.ResourceMethods { config := apigateway.GetMethodInput{RestApiId: api.Id, ResourceId: resource.Id, HttpMethod: aws.String(method)} resp, err := svc.GetMethod(ctx, &config, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_resources.go b/plugins/source/aws/resources/services/apigateway/rest_api_resources.go index beb9ac681d8f6f..3068b60ce45528 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_resources.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_resources.go @@ -45,7 +45,7 @@ func restApiResources() *schema.Table { func fetchApigatewayRestApiResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetResourcesInput{RestApiId: r.Id, Limit: aws.Int32(500)} for p := apigateway.NewGetResourcesPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/rest_api_stages.go b/plugins/source/aws/resources/services/apigateway/rest_api_stages.go index 0d07a881b48a32..b6b4f163ba8294 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_api_stages.go +++ b/plugins/source/aws/resources/services/apigateway/rest_api_stages.go @@ -42,7 +42,7 @@ func restApiStages() *schema.Table { func fetchApigatewayRestApiStages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RestApi) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetStagesInput{RestApiId: r.Id} response, err := svc.GetStages(ctx, &config, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/rest_apis.go b/plugins/source/aws/resources/services/apigateway/rest_apis.go index b939642fd048a2..2504a1e48c3a11 100644 --- a/plugins/source/aws/resources/services/apigateway/rest_apis.go +++ b/plugins/source/aws/resources/services/apigateway/rest_apis.go @@ -51,7 +51,7 @@ func fetchApigatewayRestApis(ctx context.Context, meta schema.ClientMeta, parent Limit: aws.Int32(500), } cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway for p := apigateway.NewGetRestApisPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigateway/usage_plans.go b/plugins/source/aws/resources/services/apigateway/usage_plans.go index e7dde4b863def6..c8033accf6ab9b 100644 --- a/plugins/source/aws/resources/services/apigateway/usage_plans.go +++ b/plugins/source/aws/resources/services/apigateway/usage_plans.go @@ -42,7 +42,7 @@ func UsagePlans() *schema.Table { func fetchApigatewayUsagePlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigateway.GetUsagePlansInput cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway for p := apigateway.NewGetUsagePlansPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { options.Region = cl.Region @@ -68,7 +68,7 @@ func resolveApigatewayUsagePlanArn(ctx context.Context, meta schema.ClientMeta, func fetchApigatewayUsagePlanKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.UsagePlan) cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway config := apigateway.GetUsagePlanKeysInput{UsagePlanId: r.Id, Limit: aws.Int32(500)} for p := apigateway.NewGetUsagePlanKeysPaginator(svc, &config); p.HasMorePages(); { response, err := p.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigateway/vpc_links.go b/plugins/source/aws/resources/services/apigateway/vpc_links.go index 616639f52a9e6e..532ae3f7d4b907 100644 --- a/plugins/source/aws/resources/services/apigateway/vpc_links.go +++ b/plugins/source/aws/resources/services/apigateway/vpc_links.go @@ -38,7 +38,7 @@ func VpcLinks() *schema.Table { func fetchApigatewayVpcLinks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigateway.GetVpcLinksInput cl := meta.(*client.Client) - svc := cl.Services().Apigateway + svc := cl.Services(client.AWSServiceApigateway).Apigateway paginator := apigateway.NewGetVpcLinksPaginator(svc, &config) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *apigateway.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go index 1d0a3c53b76cfe..ca6d58a35ed390 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_authorizers.go @@ -50,7 +50,7 @@ func fetchApigatewayv2ApiAuthorizers(ctx context.Context, meta schema.ClientMeta ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetAuthorizers(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go index a4fcfc46d7509e..2e334d0c92489c 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_deployments.go @@ -49,7 +49,7 @@ func fetchApigatewayv2ApiDeployments(ctx context.Context, meta schema.ClientMeta ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetDeployments(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go b/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go index 084b00675b716f..fa7fe1bf97d1ff 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integration_responses.go @@ -52,7 +52,7 @@ func fetchApigatewayv2ApiIntegrationResponses(ctx context.Context, meta schema.C IntegrationId: r.IntegrationId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetIntegrationResponses(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go index d35eeea1d25354..fe1ea85ad4eeb7 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_integrations.go @@ -53,7 +53,7 @@ func fetchApigatewayv2ApiIntegrations(ctx context.Context, meta schema.ClientMet ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetIntegrations(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_models.go b/plugins/source/aws/resources/services/apigatewayv2/api_models.go index 3d10f46f1a957b..d56100106477f3 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_models.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_models.go @@ -54,7 +54,7 @@ func fetchApigatewayv2ApiModels(ctx context.Context, meta schema.ClientMeta, par ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetModels(ctx, &config, func(options *apigatewayv2.Options) { @@ -81,7 +81,7 @@ func resolveApigatewayv2apiModelModelTemplate(ctx context.Context, meta schema.C ModelId: r.ModelId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 response, err := svc.GetModelTemplate(ctx, &config, func(options *apigatewayv2.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go b/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go index 3ee8c39b122ed0..bab4dfc06b39ba 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_route_responses.go @@ -52,7 +52,7 @@ func fetchApigatewayv2ApiRouteResponses(ctx context.Context, meta schema.ClientM RouteId: r.RouteId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetRouteResponses(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go index b54c0bb6ebfbfb..65383a4b0ce3f8 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_routes.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_routes.go @@ -53,7 +53,7 @@ func fetchApigatewayv2ApiRoutes(ctx context.Context, meta schema.ClientMeta, par ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetRoutes(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go index 7c38b3395379d7..8677f6d6515127 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/api_stages.go +++ b/plugins/source/aws/resources/services/apigatewayv2/api_stages.go @@ -50,7 +50,7 @@ func fetchApigatewayv2ApiStages(ctx context.Context, meta schema.ClientMeta, par ApiId: r.ApiId, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetStages(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/apis.go b/plugins/source/aws/resources/services/apigatewayv2/apis.go index f8cfe8692a6db9..cae936f840a422 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/apis.go +++ b/plugins/source/aws/resources/services/apigatewayv2/apis.go @@ -51,7 +51,7 @@ func Apis() *schema.Table { func fetchApigatewayv2Apis(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigatewayv2.GetApisInput cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetApis(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go b/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go index 8120942ee02b41..757378719e3b62 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go +++ b/plugins/source/aws/resources/services/apigatewayv2/domain_name_rest_api_mappings.go @@ -45,7 +45,7 @@ func fetchApigatewayv2DomainNameRestApiMappings(ctx context.Context, meta schema DomainName: r.DomainName, } cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 for { response, err := svc.GetApiMappings(ctx, &config, func(options *apigatewayv2.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go index 679b6ce100faf4..1b88f40d5c252c 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/domain_names.go +++ b/plugins/source/aws/resources/services/apigatewayv2/domain_names.go @@ -41,7 +41,7 @@ func DomainNames() *schema.Table { func fetchApigatewayv2DomainNames(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { var config apigatewayv2.GetDomainNamesInput cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetDomainNames(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go index 1c1dc6e8a7232b..4dda1df368f6b3 100644 --- a/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go +++ b/plugins/source/aws/resources/services/apigatewayv2/vpc_links.go @@ -38,7 +38,7 @@ func VpcLinks() *schema.Table { func fetchApigatewayv2VpcLinks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apigatewayv2.GetVpcLinksInput cl := meta.(*client.Client) - svc := cl.Services().Apigatewayv2 + svc := cl.Services(client.AWSServiceApigatewayv2).Apigatewayv2 // No paginator available for { response, err := svc.GetVpcLinks(ctx, &config, func(options *apigatewayv2.Options) { diff --git a/plugins/source/aws/resources/services/appconfig/applications.go b/plugins/source/aws/resources/services/appconfig/applications.go index 4e6869c6538081..48be745f7c16f4 100644 --- a/plugins/source/aws/resources/services/appconfig/applications.go +++ b/plugins/source/aws/resources/services/appconfig/applications.go @@ -41,7 +41,7 @@ func Applications() *schema.Table { func fetchApplications(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig paginator := appconfig.NewListApplicationsPaginator(svc, nil) for paginator.HasMorePages() { resp, err := paginator.NextPage(ctx, func(options *appconfig.Options) { diff --git a/plugins/source/aws/resources/services/appconfig/configuration_profiles.go b/plugins/source/aws/resources/services/appconfig/configuration_profiles.go index f3342c87e3bb60..6d6b8f9923ad3b 100644 --- a/plugins/source/aws/resources/services/appconfig/configuration_profiles.go +++ b/plugins/source/aws/resources/services/appconfig/configuration_profiles.go @@ -50,7 +50,7 @@ func fetchConfigurationProfiles(ctx context.Context, meta schema.ClientMeta, par ApplicationId: r.Id, } cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig paginator := appconfig.NewListConfigurationProfilesPaginator(svc, &config) for paginator.HasMorePages() { @@ -68,7 +68,7 @@ func fetchConfigurationProfiles(ctx context.Context, meta schema.ClientMeta, par func getConfigurationProfiles(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig configurationProfileSummary := resource.Item.(types.ConfigurationProfileSummary) input := appconfig.GetConfigurationProfileInput{ ApplicationId: configurationProfileSummary.ApplicationId, diff --git a/plugins/source/aws/resources/services/appconfig/deployment_strategies.go b/plugins/source/aws/resources/services/appconfig/deployment_strategies.go index 823bf058cb9840..c31243d62b3ca9 100644 --- a/plugins/source/aws/resources/services/appconfig/deployment_strategies.go +++ b/plugins/source/aws/resources/services/appconfig/deployment_strategies.go @@ -38,7 +38,7 @@ func DeploymentStrategies() *schema.Table { func fetchDeploymentStrategies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig paginator := appconfig.NewListDeploymentStrategiesPaginator(svc, nil) for paginator.HasMorePages() { resp, err := paginator.NextPage(ctx, func(options *appconfig.Options) { diff --git a/plugins/source/aws/resources/services/appconfig/environments.go b/plugins/source/aws/resources/services/appconfig/environments.go index 5c23084be5bc49..5d9c6e336b2702 100644 --- a/plugins/source/aws/resources/services/appconfig/environments.go +++ b/plugins/source/aws/resources/services/appconfig/environments.go @@ -47,7 +47,7 @@ func fetchEnvironments(ctx context.Context, meta schema.ClientMeta, parent *sche ApplicationId: r.Id, } cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig paginator := appconfig.NewListEnvironmentsPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go b/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go index 12a7c1996b9ad3..535734bb238485 100644 --- a/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go +++ b/plugins/source/aws/resources/services/appconfig/hosted_config_versions.go @@ -49,7 +49,7 @@ func fetchHostedConfigurationVersions(ctx context.Context, meta schema.ClientMet ConfigurationProfileId: r.Id, } cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig paginator := appconfig.NewListHostedConfigurationVersionsPaginator(svc, &config) for paginator.HasMorePages() { @@ -67,7 +67,7 @@ func fetchHostedConfigurationVersions(ctx context.Context, meta schema.ClientMet func getHostedConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appconfig + svc := cl.Services(client.AWSServiceAppconfig).Appconfig hostedConfigurationVersionSummary := resource.Item.(types.HostedConfigurationVersionSummary) input := appconfig.GetHostedConfigurationVersionInput{ ApplicationId: hostedConfigurationVersionSummary.ApplicationId, diff --git a/plugins/source/aws/resources/services/appflow/flows.go b/plugins/source/aws/resources/services/appflow/flows.go index 145b66234a47f8..93fd2605cdf4d0 100644 --- a/plugins/source/aws/resources/services/appflow/flows.go +++ b/plugins/source/aws/resources/services/appflow/flows.go @@ -35,7 +35,7 @@ func Flows() *schema.Table { func fetchFlows(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appflow + svc := cl.Services(client.AWSServiceAppflow).Appflow paginator := appflow.NewListFlowsPaginator(svc, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(o *appflow.Options) { @@ -51,7 +51,7 @@ func fetchFlows(ctx context.Context, meta schema.ClientMeta, parent *schema.Reso func getFlow(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appflow + svc := cl.Services(client.AWSServiceAppflow).Appflow input := appflow.DescribeFlowInput{FlowName: resource.Item.(types.FlowDefinition).FlowName} output, err := svc.DescribeFlow(ctx, &input, func(o *appflow.Options) { o.Region = cl.Region }) if err != nil { diff --git a/plugins/source/aws/resources/services/applicationautoscaling/policies.go b/plugins/source/aws/resources/services/applicationautoscaling/policies.go index 79d059bdc64813..9c77046f4383c0 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/policies.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/policies.go @@ -34,7 +34,7 @@ func Policies() *schema.Table { func fetchPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Applicationautoscaling + svc := cl.Services(client.AWSServiceApplicationautoscaling).Applicationautoscaling config := applicationautoscaling.DescribeScalingPoliciesInput{ ServiceNamespace: types.ServiceNamespace(cl.AutoscalingNamespace), diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go b/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go index f2b2a9c58f5200..9bc9ff7b3fc3dd 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scalable_targets.go @@ -27,7 +27,7 @@ func ScalableTargets() *schema.Table { func fetchScalableTargets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Applicationautoscaling + svc := cl.Services(client.AWSServiceApplicationautoscaling).Applicationautoscaling config := applicationautoscaling.DescribeScalableTargetsInput{ ServiceNamespace: types.ServiceNamespace(cl.AutoscalingNamespace), diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go b/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go index fc6a7025224341..f84306e52fa0eb 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scaling_activities.go @@ -27,7 +27,7 @@ func ScalingActivities() *schema.Table { func fetchScalingActivities(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Applicationautoscaling + svc := cl.Services(client.AWSServiceApplicationautoscaling).Applicationautoscaling config := applicationautoscaling.DescribeScalingActivitiesInput{ ServiceNamespace: types.ServiceNamespace(cl.AutoscalingNamespace), diff --git a/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go b/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go index 32b771c26d56d9..1c29cae1a4fd40 100644 --- a/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go +++ b/plugins/source/aws/resources/services/applicationautoscaling/scheduled_actions.go @@ -34,7 +34,7 @@ func ScheduledActions() *schema.Table { func fetchScheduledActions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Applicationautoscaling + svc := cl.Services(client.AWSServiceApplicationautoscaling).Applicationautoscaling config := applicationautoscaling.DescribeScheduledActionsInput{ ServiceNamespace: types.ServiceNamespace(cl.AutoscalingNamespace), diff --git a/plugins/source/aws/resources/services/appmesh/meshes.go b/plugins/source/aws/resources/services/appmesh/meshes.go index 8f51836da906cb..c7f7be0127950d 100644 --- a/plugins/source/aws/resources/services/appmesh/meshes.go +++ b/plugins/source/aws/resources/services/appmesh/meshes.go @@ -59,7 +59,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func fetchMeshes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh paginator := appmesh.NewListMeshesPaginator(svc, nil) for paginator.HasMorePages() { @@ -76,7 +76,7 @@ func fetchMeshes(ctx context.Context, meta schema.ClientMeta, parent *schema.Res func getMesh(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh mesh := resource.Item.(types.MeshRef) input := appmesh.DescribeMeshInput{ MeshName: mesh.MeshName, @@ -93,7 +93,7 @@ func getMesh(ctx context.Context, meta schema.ClientMeta, resource *schema.Resou func resolveMeshTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { mesh := resource.Item.(*types.MeshData) cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh paginator := appmesh.NewListTagsForResourcePaginator(svc, &appmesh.ListTagsForResourceInput{ ResourceArn: mesh.Metadata.Arn, diff --git a/plugins/source/aws/resources/services/appmesh/virtual_gateways.go b/plugins/source/aws/resources/services/appmesh/virtual_gateways.go index e8861e9eee3dbe..f9e89d706cb0e1 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_gateways.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_gateways.go @@ -49,7 +49,7 @@ func virtualGateways() *schema.Table { func fetchVirtualGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh md := parent.Item.(*types.MeshData) input := &appmesh.ListVirtualGatewaysInput{ MeshName: md.MeshName, @@ -70,7 +70,7 @@ func fetchVirtualGateways(ctx context.Context, meta schema.ClientMeta, parent *s func getVirtualGateway(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh vgr := resource.Item.(types.VirtualGatewayRef) input := appmesh.DescribeVirtualGatewayInput{ MeshName: vgr.MeshName, diff --git a/plugins/source/aws/resources/services/appmesh/virtual_nodes.go b/plugins/source/aws/resources/services/appmesh/virtual_nodes.go index 4c70cfd4bfc1ef..ced8a699e7523d 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_nodes.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_nodes.go @@ -49,7 +49,7 @@ func virtualNodes() *schema.Table { func fetchVirtualNodes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh md := parent.Item.(*types.MeshData) input := &appmesh.ListVirtualNodesInput{ MeshName: md.MeshName, @@ -70,7 +70,7 @@ func fetchVirtualNodes(ctx context.Context, meta schema.ClientMeta, parent *sche func getVirtualNode(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh vnr := resource.Item.(types.VirtualNodeRef) input := appmesh.DescribeVirtualNodeInput{ MeshName: vnr.MeshName, diff --git a/plugins/source/aws/resources/services/appmesh/virtual_routers.go b/plugins/source/aws/resources/services/appmesh/virtual_routers.go index 729276465677d6..4c7e292fc62118 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_routers.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_routers.go @@ -49,7 +49,7 @@ func virtualRouters() *schema.Table { func fetchVirtualRouter(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh md := parent.Item.(*types.MeshData) input := &appmesh.ListVirtualRoutersInput{ MeshName: md.MeshName, @@ -70,7 +70,7 @@ func fetchVirtualRouter(ctx context.Context, meta schema.ClientMeta, parent *sch func getVirtualRouter(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh vrr := resource.Item.(types.VirtualRouterRef) input := appmesh.DescribeVirtualRouterInput{ MeshName: vrr.MeshName, diff --git a/plugins/source/aws/resources/services/appmesh/virtual_services.go b/plugins/source/aws/resources/services/appmesh/virtual_services.go index c40fefaa1ed076..e9e89aaeccf3b5 100644 --- a/plugins/source/aws/resources/services/appmesh/virtual_services.go +++ b/plugins/source/aws/resources/services/appmesh/virtual_services.go @@ -49,7 +49,7 @@ func virtualServices() *schema.Table { func fetchVirtualServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh md := parent.Item.(*types.MeshData) input := &appmesh.ListVirtualServicesInput{ MeshName: md.MeshName, @@ -70,7 +70,7 @@ func fetchVirtualServices(ctx context.Context, meta schema.ClientMeta, parent *s func getVirtualService(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Appmesh + svc := cl.Services(client.AWSServiceAppmesh).Appmesh vsr := resource.Item.(types.VirtualServiceRef) input := appmesh.DescribeVirtualServiceInput{ MeshName: vsr.MeshName, diff --git a/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go b/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go index 4d2e9c738a50b0..8faf81d52b5f77 100644 --- a/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/auto_scaling_configurations.go @@ -43,7 +43,7 @@ func AutoScalingConfigurations() *schema.Table { func fetchApprunnerAutoScalingConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListAutoScalingConfigurationsInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListAutoScalingConfigurationsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { @@ -58,7 +58,7 @@ func fetchApprunnerAutoScalingConfigurations(ctx context.Context, meta schema.Cl } func getAutoScalingConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner asConfig := resource.Item.(types.AutoScalingConfigurationSummary) describeTaskDefinitionOutput, err := svc.DescribeAutoScalingConfiguration(ctx, &apprunner.DescribeAutoScalingConfigurationInput{AutoScalingConfigurationArn: asConfig.AutoScalingConfigurationArn}, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/connections.go b/plugins/source/aws/resources/services/apprunner/connections.go index 5a22f0d8463b23..119a501af707dc 100644 --- a/plugins/source/aws/resources/services/apprunner/connections.go +++ b/plugins/source/aws/resources/services/apprunner/connections.go @@ -42,7 +42,7 @@ func Connections() *schema.Table { func fetchApprunnerConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListConnectionsInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListConnectionsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/custom_domains.go b/plugins/source/aws/resources/services/apprunner/custom_domains.go index 561bf4ca422967..70f6a4ec112f46 100644 --- a/plugins/source/aws/resources/services/apprunner/custom_domains.go +++ b/plugins/source/aws/resources/services/apprunner/custom_domains.go @@ -31,7 +31,7 @@ func customDomains() *schema.Table { func fetchApprunnerCustomDomains(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := apprunner.NewDescribeCustomDomainsPaginator(meta.(*client.Client).Services().Apprunner, + paginator := apprunner.NewDescribeCustomDomainsPaginator(meta.(*client.Client).Services(client.AWSServiceApprunner).Apprunner, &apprunner.DescribeCustomDomainsInput{ServiceArn: parent.Item.(*types.Service).ServiceArn}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/observability_configurations.go b/plugins/source/aws/resources/services/apprunner/observability_configurations.go index 68177ff0447a7d..eebdd6eb993f1f 100644 --- a/plugins/source/aws/resources/services/apprunner/observability_configurations.go +++ b/plugins/source/aws/resources/services/apprunner/observability_configurations.go @@ -43,7 +43,7 @@ func ObservabilityConfigurations() *schema.Table { func fetchApprunnerObservabilityConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListObservabilityConfigurationsInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListObservabilityConfigurationsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { @@ -59,7 +59,7 @@ func fetchApprunnerObservabilityConfigurations(ctx context.Context, meta schema. func getObservabilityConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner service := resource.Item.(types.ObservabilityConfigurationSummary) describeTaskDefinitionOutput, err := svc.DescribeObservabilityConfiguration(ctx, &apprunner.DescribeObservabilityConfigurationInput{ObservabilityConfigurationArn: service.ObservabilityConfigurationArn}, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/operations.go b/plugins/source/aws/resources/services/apprunner/operations.go index 5202afe353ed3e..8334873d9d51e7 100644 --- a/plugins/source/aws/resources/services/apprunner/operations.go +++ b/plugins/source/aws/resources/services/apprunner/operations.go @@ -25,7 +25,7 @@ func operations() *schema.Table { func fetchApprunnerOperations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := apprunner.NewListOperationsPaginator(cl.Services().Apprunner, + paginator := apprunner.NewListOperationsPaginator(cl.Services(client.AWSServiceApprunner).Apprunner, &apprunner.ListOperationsInput{ServiceArn: parent.Item.(*types.Service).ServiceArn}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/services.go b/plugins/source/aws/resources/services/apprunner/services.go index 317cb6197d6984..149327e0ceb76e 100644 --- a/plugins/source/aws/resources/services/apprunner/services.go +++ b/plugins/source/aws/resources/services/apprunner/services.go @@ -47,7 +47,7 @@ func Services() *schema.Table { func fetchApprunnerServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListServicesInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListServicesPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { @@ -63,7 +63,7 @@ func fetchApprunnerServices(ctx context.Context, meta schema.ClientMeta, parent func getService(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner service := resource.Item.(types.ServiceSummary) describeTaskDefinitionOutput, err := svc.DescribeService(ctx, &apprunner.DescribeServiceInput{ServiceArn: service.ServiceArn}, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/tag_fetch.go b/plugins/source/aws/resources/services/apprunner/tag_fetch.go index fc7030de6668b4..a696b9ba6cdc01 100644 --- a/plugins/source/aws/resources/services/apprunner/tag_fetch.go +++ b/plugins/source/aws/resources/services/apprunner/tag_fetch.go @@ -22,7 +22,7 @@ func resolveApprunnerTags(path string) schema.ColumnResolver { return nil } cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner params := apprunner.ListTagsForResourceInput{ResourceArn: arn} output, err := svc.ListTagsForResource(ctx, ¶ms, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go index dbfed46805c756..e9442322bc6566 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_connectors.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_connectors.go @@ -42,7 +42,7 @@ func VpcConnectors() *schema.Table { func fetchApprunnerVpcConnectors(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListVpcConnectorsInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListVpcConnectorsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go b/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go index c4fe3550cebf0e..c0d06194f7664f 100644 --- a/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go +++ b/plugins/source/aws/resources/services/apprunner/vpc_ingress_connections.go @@ -51,7 +51,7 @@ Notes: func fetchApprunnerVpcIngressConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config apprunner.ListVpcIngressConnectionsInput cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner paginator := apprunner.NewListVpcIngressConnectionsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *apprunner.Options) { @@ -67,7 +67,7 @@ func fetchApprunnerVpcIngressConnections(ctx context.Context, meta schema.Client func getVpcIngressConnection(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Apprunner + svc := cl.Services(client.AWSServiceApprunner).Apprunner asConfig := resource.Item.(types.VpcIngressConnectionSummary) describeTaskDefinitionOutput, err := svc.DescribeVpcIngressConnection(ctx, &apprunner.DescribeVpcIngressConnectionInput{VpcIngressConnectionArn: asConfig.VpcIngressConnectionArn}, func(options *apprunner.Options) { diff --git a/plugins/source/aws/resources/services/appstream/app_blocks.go b/plugins/source/aws/resources/services/appstream/app_blocks.go index 40bf3d3ae74a3b..7851c2a7e2d40b 100644 --- a/plugins/source/aws/resources/services/appstream/app_blocks.go +++ b/plugins/source/aws/resources/services/appstream/app_blocks.go @@ -36,7 +36,7 @@ func AppBlocks() *schema.Table { func fetchAppstreamAppBlocks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeAppBlocksInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeAppBlocks(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go index fd994ccbbbe770..90cedaf707aa1a 100644 --- a/plugins/source/aws/resources/services/appstream/application_fleet_associations.go +++ b/plugins/source/aws/resources/services/appstream/application_fleet_associations.go @@ -45,7 +45,7 @@ func fetchAppstreamApplicationFleetAssociations(ctx context.Context, meta schema input.ApplicationArn = parentApplication.Arn cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeApplicationFleetAssociations(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/applications.go b/plugins/source/aws/resources/services/appstream/applications.go index 3863fc7bc3f8b7..27e26790d1d0c8 100644 --- a/plugins/source/aws/resources/services/appstream/applications.go +++ b/plugins/source/aws/resources/services/appstream/applications.go @@ -39,7 +39,7 @@ func Applications() *schema.Table { func fetchAppstreamApplications(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeApplicationsInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeApplications(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/directory_configs.go b/plugins/source/aws/resources/services/appstream/directory_configs.go index 46e5b93ff37ab9..5c6fed30191403 100644 --- a/plugins/source/aws/resources/services/appstream/directory_configs.go +++ b/plugins/source/aws/resources/services/appstream/directory_configs.go @@ -36,7 +36,7 @@ func DirectoryConfigs() *schema.Table { func fetchAppstreamDirectoryConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeDirectoryConfigsInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeDirectoryConfigs(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/fleets.go b/plugins/source/aws/resources/services/appstream/fleets.go index af9d981dfa42af..0323fd23da963a 100644 --- a/plugins/source/aws/resources/services/appstream/fleets.go +++ b/plugins/source/aws/resources/services/appstream/fleets.go @@ -36,7 +36,7 @@ func Fleets() *schema.Table { func fetchAppstreamFleets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeFleetsInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeFleets(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/image_builders.go b/plugins/source/aws/resources/services/appstream/image_builders.go index 8946cb586cd8a2..1056a0b7c94ec5 100644 --- a/plugins/source/aws/resources/services/appstream/image_builders.go +++ b/plugins/source/aws/resources/services/appstream/image_builders.go @@ -36,7 +36,7 @@ func ImageBuilders() *schema.Table { func fetchAppstreamImageBuilders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeImageBuildersInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeImageBuilders(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/images.go b/plugins/source/aws/resources/services/appstream/images.go index 4cc7a2fbe327d8..f5449d37d953e6 100644 --- a/plugins/source/aws/resources/services/appstream/images.go +++ b/plugins/source/aws/resources/services/appstream/images.go @@ -26,7 +26,7 @@ func Images() *schema.Table { func fetchAppstreamImages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { input := appstream.DescribeImagesInput{MaxResults: aws.Int32(25)} cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream paginator := appstream.NewDescribeImagesPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/stack_entitlements.go b/plugins/source/aws/resources/services/appstream/stack_entitlements.go index f5222190c84957..cc15b47f657d9e 100644 --- a/plugins/source/aws/resources/services/appstream/stack_entitlements.go +++ b/plugins/source/aws/resources/services/appstream/stack_entitlements.go @@ -42,7 +42,7 @@ func fetchAppstreamStackEntitlements(ctx context.Context, meta schema.ClientMeta var input appstream.DescribeEntitlementsInput input.StackName = parent.Item.(types.Stack).Name cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeEntitlements(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/stack_user_associations.go b/plugins/source/aws/resources/services/appstream/stack_user_associations.go index 48efc2264e05c7..b9941d351bce58 100644 --- a/plugins/source/aws/resources/services/appstream/stack_user_associations.go +++ b/plugins/source/aws/resources/services/appstream/stack_user_associations.go @@ -50,7 +50,7 @@ func fetchAppstreamStackUserAssociations(ctx context.Context, meta schema.Client input.MaxResults = aws.Int32(25) cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeUserStackAssociations(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/stacks.go b/plugins/source/aws/resources/services/appstream/stacks.go index 6529ff09a99f4d..e6ebfb94896072 100644 --- a/plugins/source/aws/resources/services/appstream/stacks.go +++ b/plugins/source/aws/resources/services/appstream/stacks.go @@ -41,7 +41,7 @@ func Stacks() *schema.Table { func fetchAppstreamStacks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeStacksInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeStacks(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go b/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go index 2680ae7d0e63cf..dd1f34e67adb88 100644 --- a/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go +++ b/plugins/source/aws/resources/services/appstream/usage_report_subscriptions.go @@ -36,7 +36,7 @@ func UsageReportSubscriptions() *schema.Table { func fetchAppstreamUsageReportSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input appstream.DescribeUsageReportSubscriptionsInput cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeUsageReportSubscriptions(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appstream/users.go b/plugins/source/aws/resources/services/appstream/users.go index e6841e001cd58c..33a8d71bbb7437 100644 --- a/plugins/source/aws/resources/services/appstream/users.go +++ b/plugins/source/aws/resources/services/appstream/users.go @@ -37,7 +37,7 @@ func fetchAppstreamUsers(ctx context.Context, meta schema.ClientMeta, parent *sc var input appstream.DescribeUsersInput input.AuthenticationType = types.AuthenticationTypeUserpool cl := meta.(*client.Client) - svc := cl.Services().Appstream + svc := cl.Services(client.AWSServiceAppstream).Appstream // No paginator available for { response, err := svc.DescribeUsers(ctx, &input, func(options *appstream.Options) { diff --git a/plugins/source/aws/resources/services/appsync/graphql_apis.go b/plugins/source/aws/resources/services/appsync/graphql_apis.go index 733c0a94d7f1df..a14627c97e191d 100644 --- a/plugins/source/aws/resources/services/appsync/graphql_apis.go +++ b/plugins/source/aws/resources/services/appsync/graphql_apis.go @@ -36,7 +36,7 @@ func GraphqlApis() *schema.Table { func fetchAppsyncGraphqlApis(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config appsync.ListGraphqlApisInput cl := meta.(*client.Client) - svc := cl.Services().Appsync + svc := cl.Services(client.AWSServiceAppsync).Appsync // No paginator available for { output, err := svc.ListGraphqlApis(ctx, &config, func(options *appsync.Options) { diff --git a/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go b/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go index 2cd35103a91cb6..3e55821f593de7 100644 --- a/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go +++ b/plugins/source/aws/resources/services/athena/data_catalog_database_tables.go @@ -45,7 +45,7 @@ func dataCatalogDatabaseTables() *schema.Table { func fetchAthenaDataCatalogDatabaseTables(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena input := athena.ListTableMetadataInput{ CatalogName: parent.Parent.Item.(types.DataCatalog).Name, DatabaseName: parent.Item.(types.Database).Name, diff --git a/plugins/source/aws/resources/services/athena/data_catalog_databases.go b/plugins/source/aws/resources/services/athena/data_catalog_databases.go index 8b1dbbc271ef7b..99457f84ae2fb1 100644 --- a/plugins/source/aws/resources/services/athena/data_catalog_databases.go +++ b/plugins/source/aws/resources/services/athena/data_catalog_databases.go @@ -43,7 +43,7 @@ func dataCatalogDatabases() *schema.Table { func fetchAthenaDataCatalogDatabases(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena input := athena.ListDatabasesInput{ CatalogName: parent.Item.(types.DataCatalog).Name, } diff --git a/plugins/source/aws/resources/services/athena/data_catalogs.go b/plugins/source/aws/resources/services/athena/data_catalogs.go index 6857ddc3deb341..a2edf09b33dbc6 100644 --- a/plugins/source/aws/resources/services/athena/data_catalogs.go +++ b/plugins/source/aws/resources/services/athena/data_catalogs.go @@ -48,7 +48,7 @@ func DataCatalogs() *schema.Table { func fetchAthenaDataCatalogs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena input := athena.ListDataCatalogsInput{} paginator := athena.NewListDataCatalogsPaginator(svc, &input) for paginator.HasMorePages() { @@ -65,7 +65,7 @@ func fetchAthenaDataCatalogs(ctx context.Context, meta schema.ClientMeta, parent func getDataCatalog(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena catalogSummary := resource.Item.(types.DataCatalogSummary) dc, err := svc.GetDataCatalog(ctx, &athena.GetDataCatalogInput{ Name: catalogSummary.CatalogName, @@ -93,7 +93,7 @@ func resolveAthenaDataCatalogArn(ctx context.Context, meta schema.ClientMeta, re func resolveAthenaDataCatalogTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena dc := resource.Item.(types.DataCatalog) arnStr := createDataCatalogArn(cl, *dc.Name) paginator := athena.NewListTagsForResourcePaginator(svc, &athena.ListTagsForResourceInput{ResourceARN: &arnStr}) diff --git a/plugins/source/aws/resources/services/athena/work_group_named_queries.go b/plugins/source/aws/resources/services/athena/work_group_named_queries.go index 636d836c32b7eb..c1d490a3812d8c 100644 --- a/plugins/source/aws/resources/services/athena/work_group_named_queries.go +++ b/plugins/source/aws/resources/services/athena/work_group_named_queries.go @@ -34,7 +34,7 @@ func workGroupNamedQueries() *schema.Table { func fetchAthenaWorkGroupNamedQueries(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := parent.Item.(types.WorkGroup) input := athena.ListNamedQueriesInput{WorkGroup: wg.Name} paginator := athena.NewListNamedQueriesPaginator(svc, &input) @@ -52,7 +52,7 @@ func fetchAthenaWorkGroupNamedQueries(ctx context.Context, meta schema.ClientMet func getWorkGroupNamedQuery(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena d := resource.Item.(string) dc, err := svc.GetNamedQuery(ctx, &athena.GetNamedQueryInput{ diff --git a/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go b/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go index abb792cc97948b..451bd5d31be094 100644 --- a/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go +++ b/plugins/source/aws/resources/services/athena/work_group_prepared_statements.go @@ -33,7 +33,7 @@ func workGroupPreparedStatements() *schema.Table { func fetchAthenaWorkGroupPreparedStatements(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := parent.Item.(types.WorkGroup) input := athena.ListPreparedStatementsInput{WorkGroup: wg.Name} paginator := athena.NewListPreparedStatementsPaginator(svc, &input) @@ -51,7 +51,7 @@ func fetchAthenaWorkGroupPreparedStatements(ctx context.Context, meta schema.Cli func getWorkGroupPreparedStatement(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := resource.Parent.Item.(types.WorkGroup) d := resource.Item.(types.PreparedStatementSummary) diff --git a/plugins/source/aws/resources/services/athena/work_group_query_executions.go b/plugins/source/aws/resources/services/athena/work_group_query_executions.go index d88c67a438464d..91224dcbdc18d6 100644 --- a/plugins/source/aws/resources/services/athena/work_group_query_executions.go +++ b/plugins/source/aws/resources/services/athena/work_group_query_executions.go @@ -34,7 +34,7 @@ func workGroupQueryExecutions() *schema.Table { func fetchAthenaWorkGroupQueryExecutions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := parent.Item.(types.WorkGroup) paginator := athena.NewListQueryExecutionsPaginator(svc, &athena.ListQueryExecutionsInput{WorkGroup: wg.Name}) for paginator.HasMorePages() { @@ -51,7 +51,7 @@ func fetchAthenaWorkGroupQueryExecutions(ctx context.Context, meta schema.Client func getWorkGroupQueryExecution(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena d := resource.Item.(string) dc, err := svc.GetQueryExecution(ctx, &athena.GetQueryExecutionInput{ diff --git a/plugins/source/aws/resources/services/athena/work_groups.go b/plugins/source/aws/resources/services/athena/work_groups.go index 90b6d8a1cbdd23..8778f99c852950 100644 --- a/plugins/source/aws/resources/services/athena/work_groups.go +++ b/plugins/source/aws/resources/services/athena/work_groups.go @@ -50,7 +50,7 @@ func WorkGroups() *schema.Table { func fetchAthenaWorkGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena input := athena.ListWorkGroupsInput{} paginator := athena.NewListWorkGroupsPaginator(svc, &input) for paginator.HasMorePages() { @@ -68,7 +68,7 @@ func fetchAthenaWorkGroups(ctx context.Context, meta schema.ClientMeta, parent * func getWorkGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := resource.Item.(types.WorkGroupSummary) dc, err := svc.GetWorkGroup(ctx, &athena.GetWorkGroupInput{ @@ -91,7 +91,7 @@ func resolveAthenaWorkGroupArn(ctx context.Context, meta schema.ClientMeta, reso func resolveAthenaWorkGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Athena + svc := cl.Services(client.AWSServiceAthena).Athena wg := resource.Item.(types.WorkGroup) arnStr := createWorkGroupArn(cl, *wg.Name) params := athena.ListTagsForResourceInput{ResourceARN: &arnStr} diff --git a/plugins/source/aws/resources/services/auditmanager/assesments.go b/plugins/source/aws/resources/services/auditmanager/assesments.go index 34fdc60838e966..6fb24aa25ad3d6 100644 --- a/plugins/source/aws/resources/services/auditmanager/assesments.go +++ b/plugins/source/aws/resources/services/auditmanager/assesments.go @@ -28,7 +28,7 @@ func Assessments() *schema.Table { func fetchAssessments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Auditmanager + svc := cl.Services(client.AWSServiceAuditmanager).Auditmanager paginator := auditmanager.NewListAssessmentsPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *auditmanager.Options) { @@ -44,7 +44,7 @@ func fetchAssessments(ctx context.Context, meta schema.ClientMeta, parent *schem func getAssessment(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Auditmanager + svc := cl.Services(client.AWSServiceAuditmanager).Auditmanager input := auditmanager.GetAssessmentInput{AssessmentId: resource.Item.(types.AssessmentMetadataItem).Id} output, err := svc.GetAssessment(ctx, &input, func(o *auditmanager.Options) { o.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go b/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go index f6f2f1ee273808..48d18d2862495c 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go +++ b/plugins/source/aws/resources/services/autoscaling/group_lifecycle_hooks.go @@ -34,7 +34,7 @@ func groupLifecycleHooks() *schema.Table { func fetchAutoscalingGroupLifecycleHooks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(models.AutoScalingGroupWrapper) cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling config := autoscaling.DescribeLifecycleHooksInput{AutoScalingGroupName: p.AutoScalingGroupName} output, err := svc.DescribeLifecycleHooks(ctx, &config, func(options *autoscaling.Options) { diff --git a/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go b/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go index 13ba4261ad31c9..65187b1000d944 100644 --- a/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go +++ b/plugins/source/aws/resources/services/autoscaling/group_scaling_policies.go @@ -40,7 +40,7 @@ func groupScalingPolicies() *schema.Table { func fetchAutoscalingGroupScalingPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(models.AutoScalingGroupWrapper) cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling paginator := autoscaling.NewDescribePoliciesPaginator(svc, &autoscaling.DescribePoliciesInput{AutoScalingGroupName: p.AutoScalingGroupName}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *autoscaling.Options) { diff --git a/plugins/source/aws/resources/services/autoscaling/groups.go b/plugins/source/aws/resources/services/autoscaling/groups.go index 5c6fdf61f93d22..e9c25969f429a2 100644 --- a/plugins/source/aws/resources/services/autoscaling/groups.go +++ b/plugins/source/aws/resources/services/autoscaling/groups.go @@ -65,7 +65,7 @@ func Groups() *schema.Table { func fetchAutoscalingGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling processGroupsBundle := func(groups []types.AutoScalingGroup) error { input := autoscaling.DescribeNotificationConfigurationsInput{ MaxRecords: aws.Int32(100), @@ -123,7 +123,7 @@ func fetchAutoscalingGroups(ctx context.Context, meta schema.ClientMeta, parent func resolveAutoscalingGroupLoadBalancers(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { p := resource.Item.(models.AutoScalingGroupWrapper) cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling config := autoscaling.DescribeLoadBalancersInput{AutoScalingGroupName: p.AutoScalingGroupName} j := map[string]any{} // No paginator available @@ -151,7 +151,7 @@ func resolveAutoscalingGroupLoadBalancers(ctx context.Context, meta schema.Clien func resolveAutoscalingGroupLoadBalancerTargetGroups(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { p := resource.Item.(models.AutoScalingGroupWrapper) cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling config := autoscaling.DescribeLoadBalancerTargetGroupsInput{AutoScalingGroupName: p.AutoScalingGroupName} j := map[string]any{} // No paginator available diff --git a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go index f54d095619ae83..afe414691d8f9d 100644 --- a/plugins/source/aws/resources/services/autoscaling/launch_configurations.go +++ b/plugins/source/aws/resources/services/autoscaling/launch_configurations.go @@ -34,7 +34,7 @@ func LaunchConfigurations() *schema.Table { func fetchAutoscalingLaunchConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling paginator := autoscaling.NewDescribeLaunchConfigurationsPaginator(svc, &autoscaling.DescribeLaunchConfigurationsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *autoscaling.Options) { diff --git a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go index 6f9dd07e2a804c..9dbb5463d0afa0 100644 --- a/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go +++ b/plugins/source/aws/resources/services/autoscaling/scheduled_actions.go @@ -35,7 +35,7 @@ func ScheduledActions() *schema.Table { func fetchAutoscalingScheduledActions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Autoscaling + svc := cl.Services(client.AWSServiceAutoscaling).Autoscaling params := &autoscaling.DescribeScheduledActionsInput{ MaxRecords: aws.Int32(100), } diff --git a/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go b/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go index afaafb37349d66..9a2c02e661671b 100644 --- a/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go +++ b/plugins/source/aws/resources/services/autoscalingplans/plan_resources.go @@ -27,7 +27,7 @@ func planResources() *schema.Table { func fetchPlanResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Autoscalingplans + svc := cl.Services(client.AWSServiceAutoscalingplans).Autoscalingplans p := parent.Item.(types.ScalingPlan) config := autoscalingplans.DescribeScalingPlanResourcesInput{ diff --git a/plugins/source/aws/resources/services/autoscalingplans/plans.go b/plugins/source/aws/resources/services/autoscalingplans/plans.go index 7694235d2381bd..b510708a2c0416 100644 --- a/plugins/source/aws/resources/services/autoscalingplans/plans.go +++ b/plugins/source/aws/resources/services/autoscalingplans/plans.go @@ -31,7 +31,7 @@ func Plans() *schema.Table { func fetchPlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Autoscalingplans + svc := cl.Services(client.AWSServiceAutoscalingplans).Autoscalingplans config := autoscalingplans.DescribeScalingPlansInput{} // No paginator available for { diff --git a/plugins/source/aws/resources/services/backup/global_settings.go b/plugins/source/aws/resources/services/backup/global_settings.go index 01dc97419f1dd1..c0e2038723c6f5 100644 --- a/plugins/source/aws/resources/services/backup/global_settings.go +++ b/plugins/source/aws/resources/services/backup/global_settings.go @@ -26,7 +26,7 @@ func GlobalSettings() *schema.Table { func fetchBackupGlobalSettings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup input := backup.DescribeGlobalSettingsInput{} output, err := svc.DescribeGlobalSettings(ctx, &input, func(options *backup.Options) { diff --git a/plugins/source/aws/resources/services/backup/jobs.go b/plugins/source/aws/resources/services/backup/jobs.go index 7c635227f19eb0..f82d2dd0c263dc 100644 --- a/plugins/source/aws/resources/services/backup/jobs.go +++ b/plugins/source/aws/resources/services/backup/jobs.go @@ -28,7 +28,7 @@ func Jobs() *schema.Table { func fetchBackupJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListBackupJobsInput{ByAccountId: aws.String(cl.AccountID), MaxResults: aws.Int32(1000)} // maximum value from https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListBackupJobs.html paginator := backup.NewListBackupJobsPaginator(svc, ¶ms) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/backup/plan_selections.go b/plugins/source/aws/resources/services/backup/plan_selections.go index effcd68b3a60a7..698d1f6303ead5 100644 --- a/plugins/source/aws/resources/services/backup/plan_selections.go +++ b/plugins/source/aws/resources/services/backup/plan_selections.go @@ -33,7 +33,7 @@ func planSelections() *schema.Table { func fetchBackupPlanSelections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { plan := parent.Item.(*backup.GetBackupPlanOutput) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListBackupSelectionsInput{ BackupPlanId: plan.BackupPlanId, MaxResults: aws.Int32(1000), // maximum value from https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListBackupSelections.html diff --git a/plugins/source/aws/resources/services/backup/plans.go b/plugins/source/aws/resources/services/backup/plans.go index e4b1bb03982d3c..51d62acd53f6b4 100644 --- a/plugins/source/aws/resources/services/backup/plans.go +++ b/plugins/source/aws/resources/services/backup/plans.go @@ -47,7 +47,7 @@ func Plans() *schema.Table { func fetchBackupPlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListBackupPlansInput{MaxResults: aws.Int32(1000)} // maximum value from https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListBackupPlans.html paginator := backup.NewListBackupPlansPaginator(svc, ¶ms) for paginator.HasMorePages() { @@ -64,7 +64,7 @@ func fetchBackupPlans(ctx context.Context, meta schema.ClientMeta, parent *schem func getPlan(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup m := resource.Item.(types.BackupPlansListMember) plan, err := svc.GetBackupPlan( @@ -84,7 +84,7 @@ func getPlan(ctx context.Context, meta schema.ClientMeta, resource *schema.Resou func resolvePlanTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { plan := resource.Item.(*backup.GetBackupPlanOutput) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListTagsInput{ResourceArn: plan.BackupPlanArn} tags := make(map[string]string) paginator := backup.NewListTagsPaginator(svc, ¶ms) diff --git a/plugins/source/aws/resources/services/backup/protected_resources.go b/plugins/source/aws/resources/services/backup/protected_resources.go index c1f3753ab2c570..20c5cb2b972c71 100644 --- a/plugins/source/aws/resources/services/backup/protected_resources.go +++ b/plugins/source/aws/resources/services/backup/protected_resources.go @@ -35,7 +35,7 @@ func ProtectedResources() *schema.Table { func listResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListProtectedResourcesInput{MaxResults: aws.Int32(1000)} // maximum value from https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListProtectedResources.html paginator := backup.NewListProtectedResourcesPaginator(svc, ¶ms) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/backup/region_settings.go b/plugins/source/aws/resources/services/backup/region_settings.go index 46d851cd8b1e32..9b8d3dea013dfb 100644 --- a/plugins/source/aws/resources/services/backup/region_settings.go +++ b/plugins/source/aws/resources/services/backup/region_settings.go @@ -26,7 +26,7 @@ func RegionSettings() *schema.Table { func fetchBackupRegionSettings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup input := backup.DescribeRegionSettingsInput{} output, err := svc.DescribeRegionSettings(ctx, &input, func(options *backup.Options) { diff --git a/plugins/source/aws/resources/services/backup/report_plans.go b/plugins/source/aws/resources/services/backup/report_plans.go index 73b4f31fc28f4d..b8e30abc9d605e 100644 --- a/plugins/source/aws/resources/services/backup/report_plans.go +++ b/plugins/source/aws/resources/services/backup/report_plans.go @@ -41,7 +41,7 @@ func ReportPlans() *schema.Table { func fetchReportPlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup paginator := backup.NewListReportPlansPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *backup.Options) { @@ -58,7 +58,7 @@ func fetchReportPlans(ctx context.Context, meta schema.ClientMeta, parent *schem func resolveReportPlanTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { plan := resource.Item.(types.ReportPlan) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListTagsInput{ResourceArn: plan.ReportPlanArn} tags := make(map[string]string) paginator := backup.NewListTagsPaginator(svc, ¶ms) diff --git a/plugins/source/aws/resources/services/backup/vault_recovery_points.go b/plugins/source/aws/resources/services/backup/vault_recovery_points.go index 22b453784c0eaf..0ea1f5f5a2dc0f 100644 --- a/plugins/source/aws/resources/services/backup/vault_recovery_points.go +++ b/plugins/source/aws/resources/services/backup/vault_recovery_points.go @@ -48,7 +48,7 @@ func vaultRecoveryPoints() *schema.Table { func fetchBackupVaultRecoveryPoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup vault := parent.Item.(types.BackupVaultListMember) params := backup.ListRecoveryPointsByBackupVaultInput{BackupVaultName: vault.BackupVaultName, MaxResults: aws.Int32(100)} paginator := backup.NewListRecoveryPointsByBackupVaultPaginator(svc, ¶ms) @@ -88,7 +88,7 @@ func resolveRecoveryPointTags(ctx context.Context, meta schema.ClientMeta, resou } cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListTagsInput{ResourceArn: rp.RecoveryPointArn} tags := make(map[string]string) paginator := backup.NewListTagsPaginator(svc, ¶ms) diff --git a/plugins/source/aws/resources/services/backup/vaults.go b/plugins/source/aws/resources/services/backup/vaults.go index 2a31ee2eff62f7..bbbdddb115ffe6 100644 --- a/plugins/source/aws/resources/services/backup/vaults.go +++ b/plugins/source/aws/resources/services/backup/vaults.go @@ -58,7 +58,7 @@ func Vaults() *schema.Table { func fetchBackupVaults(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListBackupVaultsInput{MaxResults: aws.Int32(1000)} // maximum value from https://docs.aws.amazon.com/aws-backup/latest/devguide/API_ListBackupVaults.html paginator := backup.NewListBackupVaultsPaginator(svc, ¶ms) for paginator.HasMorePages() { @@ -76,7 +76,7 @@ func fetchBackupVaults(ctx context.Context, meta schema.ClientMeta, parent *sche func resolveVaultTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { vault := resource.Item.(types.BackupVaultListMember) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup params := backup.ListTagsInput{ResourceArn: vault.BackupVaultArn} tags := make(map[string]string) paginator := backup.NewListTagsPaginator(svc, ¶ms) @@ -98,7 +98,7 @@ func resolveVaultTags(ctx context.Context, meta schema.ClientMeta, resource *sch func resolveVaultAccessPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { vault := resource.Item.(types.BackupVaultListMember) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup result, err := svc.GetBackupVaultAccessPolicy( ctx, &backup.GetBackupVaultAccessPolicyInput{BackupVaultName: vault.BackupVaultName}, @@ -127,7 +127,7 @@ func resolveVaultAccessPolicy(ctx context.Context, meta schema.ClientMeta, resou func resolveVaultNotifications(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { vault := resource.Item.(types.BackupVaultListMember) cl := meta.(*client.Client) - svc := cl.Services().Backup + svc := cl.Services(client.AWSServiceBackup).Backup result, err := svc.GetBackupVaultNotifications( ctx, &backup.GetBackupVaultNotificationsInput{BackupVaultName: vault.BackupVaultName}, diff --git a/plugins/source/aws/resources/services/batch/compute_environments.go b/plugins/source/aws/resources/services/batch/compute_environments.go index f1a964ba7d065b..6bbf9fdb7fbbff 100644 --- a/plugins/source/aws/resources/services/batch/compute_environments.go +++ b/plugins/source/aws/resources/services/batch/compute_environments.go @@ -45,7 +45,7 @@ func fetchBatchComputeEnvironments(ctx context.Context, meta schema.ClientMeta, MaxResults: aws.Int32(100), } cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch p := batch.NewDescribeComputeEnvironmentsPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *batch.Options) { @@ -61,7 +61,7 @@ func fetchBatchComputeEnvironments(ctx context.Context, meta schema.ClientMeta, func resolveBatchComputeEnvironmentTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch summary := resource.Item.(types.ComputeEnvironmentDetail) input := batch.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/batch/job_definitions.go b/plugins/source/aws/resources/services/batch/job_definitions.go index 38a8f3892e6251..2684665fb9e6b8 100644 --- a/plugins/source/aws/resources/services/batch/job_definitions.go +++ b/plugins/source/aws/resources/services/batch/job_definitions.go @@ -45,7 +45,7 @@ func fetchBatchJobDefinitions(ctx context.Context, meta schema.ClientMeta, paren MaxResults: aws.Int32(100), } cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch p := batch.NewDescribeJobDefinitionsPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *batch.Options) { @@ -61,7 +61,7 @@ func fetchBatchJobDefinitions(ctx context.Context, meta schema.ClientMeta, paren func resolveBatchJobDefinitionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch summary := resource.Item.(types.JobDefinition) input := batch.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/batch/job_queues.go b/plugins/source/aws/resources/services/batch/job_queues.go index 7c33c735521a29..f652743b886e64 100644 --- a/plugins/source/aws/resources/services/batch/job_queues.go +++ b/plugins/source/aws/resources/services/batch/job_queues.go @@ -48,7 +48,7 @@ func fetchBatchJobQueues(ctx context.Context, meta schema.ClientMeta, parent *sc MaxResults: aws.Int32(100), } cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch p := batch.NewDescribeJobQueuesPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *batch.Options) { @@ -64,7 +64,7 @@ func fetchBatchJobQueues(ctx context.Context, meta schema.ClientMeta, parent *sc func resolveBatchJobQueueTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch summary := resource.Item.(types.JobQueueDetail) input := batch.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/batch/jobs.go b/plugins/source/aws/resources/services/batch/jobs.go index d90b09e0d92b3b..926d92f0b79231 100644 --- a/plugins/source/aws/resources/services/batch/jobs.go +++ b/plugins/source/aws/resources/services/batch/jobs.go @@ -57,7 +57,7 @@ func fetchBatchJobs(ctx context.Context, meta schema.ClientMeta, parent *schema. JobStatus: status, } cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch p := batch.NewListJobsPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *batch.Options) { @@ -92,7 +92,7 @@ func fetchBatchJobs(ctx context.Context, meta schema.ClientMeta, parent *schema. func resolveBatchJobTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Batch + svc := cl.Services(client.AWSServiceBatch).Batch summary := resource.Item.(types.JobDetail) input := batch.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go b/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go index 09665bd73860ba..a3ab8d9947b58f 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_instance_resource_drifts.go @@ -63,7 +63,7 @@ func fetchStackInstanceResourceDrifts(ctx context.Context, meta schema.ClientMet } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation // No paginator available for { diff --git a/plugins/source/aws/resources/services/cloudformation/stack_instances.go b/plugins/source/aws/resources/services/cloudformation/stack_instances.go index 8387396f8ac956..77b9744b888156 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_instances.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_instances.go @@ -48,7 +48,7 @@ func fetchStackInstanceSummary(ctx context.Context, meta schema.ClientMeta, pare } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation paginator := cloudformation.NewListStackInstancesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/cloudformation/stack_resources.go b/plugins/source/aws/resources/services/cloudformation/stack_resources.go index 353d19dd897933..673023573eefd2 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_resources.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_resources.go @@ -36,7 +36,7 @@ func fetchCloudformationStackResources(ctx context.Context, meta schema.ClientMe StackName: stack.StackName, } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation paginator := cloudformation.NewListStackResourcesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudformation.Options) { diff --git a/plugins/source/aws/resources/services/cloudformation/stack_templates.go b/plugins/source/aws/resources/services/cloudformation/stack_templates.go index 813577554e596e..0194956338f5c3 100644 --- a/plugins/source/aws/resources/services/cloudformation/stack_templates.go +++ b/plugins/source/aws/resources/services/cloudformation/stack_templates.go @@ -55,7 +55,7 @@ func fetchCloudformationStackTemplates(ctx context.Context, meta schema.ClientMe StackName: stack.StackName, } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation resp, err := svc.GetTemplate(ctx, &config, func(options *cloudformation.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/cloudformation/stacks.go b/plugins/source/aws/resources/services/cloudformation/stacks.go index 8cad92a8a2711f..104f4c9f5c2ddc 100644 --- a/plugins/source/aws/resources/services/cloudformation/stacks.go +++ b/plugins/source/aws/resources/services/cloudformation/stacks.go @@ -56,7 +56,7 @@ func Stacks() *schema.Table { func fetchCloudformationStacks(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { var config cloudformation.DescribeStacksInput cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation paginator := cloudformation.NewDescribeStacksPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudformation.Options) { diff --git a/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go b/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go index 89eda34566b899..d0d4db2dd1480e 100644 --- a/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go +++ b/plugins/source/aws/resources/services/cloudformation/stackset_operation_results.go @@ -54,7 +54,7 @@ func fetchCloudformationStackSetOperationResults(ctx context.Context, meta schem } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation paginator := cloudformation.NewListStackSetOperationResultsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudformation.Options) { diff --git a/plugins/source/aws/resources/services/cloudformation/stackset_operations.go b/plugins/source/aws/resources/services/cloudformation/stackset_operations.go index b355ea62b2ed02..58db22bd4bc600 100644 --- a/plugins/source/aws/resources/services/cloudformation/stackset_operations.go +++ b/plugins/source/aws/resources/services/cloudformation/stackset_operations.go @@ -49,7 +49,7 @@ func fetchCloudformationStackSetOperations(ctx context.Context, meta schema.Clie } cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation paginator := cloudformation.NewListStackSetOperationsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudformation.Options) { @@ -70,7 +70,7 @@ func fetchCloudformationStackSetOperations(ctx context.Context, meta schema.Clie func getStackSetOperation(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation stack := resource.Parent.Item.(models.ExpandedStackSet) operation := resource.Item.(models.ExpandedStackSetOperationSummary) diff --git a/plugins/source/aws/resources/services/cloudformation/stacksets.go b/plugins/source/aws/resources/services/cloudformation/stacksets.go index 77d693e696d686..2f4ec8ec026f5e 100644 --- a/plugins/source/aws/resources/services/cloudformation/stacksets.go +++ b/plugins/source/aws/resources/services/cloudformation/stacksets.go @@ -53,7 +53,7 @@ func StackSets() *schema.Table { func fetchCloudformationStackSets(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation var err error var page *cloudformation.ListStackSetsOutput // There is no way of determining if an account is a delegated admin or not. So just need to test it out and fail over to the other one @@ -90,7 +90,7 @@ func getStackSet(ctx context.Context, meta schema.ClientMeta, resource *schema.R stack := resource.Item.(models.ExpandedSummary) cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation input := &cloudformation.DescribeStackSetInput{ StackSetName: stack.StackSetName, CallAs: stack.CallAs, diff --git a/plugins/source/aws/resources/services/cloudformation/template_summaries.go b/plugins/source/aws/resources/services/cloudformation/template_summaries.go index 5fafe551eb8fc9..4996120ff10fce 100644 --- a/plugins/source/aws/resources/services/cloudformation/template_summaries.go +++ b/plugins/source/aws/resources/services/cloudformation/template_summaries.go @@ -47,7 +47,7 @@ func templateSummaries() *schema.Table { func fetchTemplateSummary(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudformation + svc := cl.Services(client.AWSServiceCloudformation).Cloudformation stack := parent.Item.(types.Stack) diff --git a/plugins/source/aws/resources/services/cloudfront/cache_policies.go b/plugins/source/aws/resources/services/cloudfront/cache_policies.go index 012109ceff14e3..a0d5519b89eaa8 100644 --- a/plugins/source/aws/resources/services/cloudfront/cache_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/cache_policies.go @@ -40,8 +40,7 @@ func CachePolicies() *schema.Table { func fetchCloudfrontCachePolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudfront.ListCachePoliciesInput cl := meta.(*client.Client) - s := cl.Services() - svc := s.Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront for { response, err := svc.ListCachePolicies(ctx, nil, func(options *cloudfront.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/cloudfront/distributions.go b/plugins/source/aws/resources/services/cloudfront/distributions.go index 67e9149a2dde83..4f1be2ad590b98 100644 --- a/plugins/source/aws/resources/services/cloudfront/distributions.go +++ b/plugins/source/aws/resources/services/cloudfront/distributions.go @@ -42,7 +42,7 @@ func Distributions() *schema.Table { func fetchCloudfrontDistributions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudfront.ListDistributionsInput cl := meta.(*client.Client) - svc := cl.Services().Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront paginator := cloudfront.NewListDistributionsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudfront.Options) { @@ -58,7 +58,7 @@ func fetchCloudfrontDistributions(ctx context.Context, meta schema.ClientMeta, p func getDistribution(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront d := resource.Item.(types.DistributionSummary) @@ -78,7 +78,7 @@ func resolveCloudfrontDistributionTags(ctx context.Context, meta schema.ClientMe distribution := resource.Item.(*types.Distribution) cl := meta.(*client.Client) - svc := cl.Services().Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront response, err := svc.ListTagsForResource(ctx, &cloudfront.ListTagsForResourceInput{ Resource: distribution.ARN, }, func(options *cloudfront.Options) { diff --git a/plugins/source/aws/resources/services/cloudfront/functions.go b/plugins/source/aws/resources/services/cloudfront/functions.go index e40359569dc607..6dd3da891875f4 100644 --- a/plugins/source/aws/resources/services/cloudfront/functions.go +++ b/plugins/source/aws/resources/services/cloudfront/functions.go @@ -42,8 +42,7 @@ func Functions() *schema.Table { func fetchFunctions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudfront.ListFunctionsInput cl := meta.(*client.Client) - s := cl.Services() - svc := s.Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront for { response, err := svc.ListFunctions(ctx, &config, func(options *cloudfront.Options) { options.Region = cl.Region @@ -65,7 +64,7 @@ func fetchFunctions(ctx context.Context, meta schema.ClientMeta, parent *schema. } func getFunction(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront f := resource.Item.(types.FunctionSummary) diff --git a/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go b/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go index 959c1934f7eeed..64f0a3d04de0d6 100644 --- a/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go +++ b/plugins/source/aws/resources/services/cloudfront/origin_access_identities.go @@ -26,8 +26,7 @@ func OriginAccessIdentities() *schema.Table { func fetchCloudfrontOriginAccessIdentities(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront var config cloudfront.ListCloudFrontOriginAccessIdentitiesInput paginator := cloudfront.NewListCloudFrontOriginAccessIdentitiesPaginator(svc, &config) diff --git a/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go b/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go index 602ae1e51d3ebb..5c98a735f8a149 100644 --- a/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/origin_request_policies.go @@ -34,8 +34,7 @@ func OriginRequestPolicies() *schema.Table { func fetchCloudfrontOriginRequestPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront var config cloudfront.ListOriginRequestPoliciesInput for { response, err := svc.ListOriginRequestPolicies(ctx, &config, func(options *cloudfront.Options) { diff --git a/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go b/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go index 4be9cb25072a39..044c7b075ed398 100644 --- a/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go +++ b/plugins/source/aws/resources/services/cloudfront/response_headers_policies.go @@ -34,8 +34,7 @@ func ResponseHeaderPolicies() *schema.Table { func fetchCloudfrontResponseHeadersPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Cloudfront + svc := cl.Services(client.AWSServiceCloudfront).Cloudfront var config cloudfront.ListResponseHeadersPoliciesInput for { response, err := svc.ListResponseHeadersPolicies(ctx, &config, func(options *cloudfront.Options) { diff --git a/plugins/source/aws/resources/services/cloudhsmv2/backups.go b/plugins/source/aws/resources/services/cloudhsmv2/backups.go index 48c5a2f638e357..69a0595688377a 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/backups.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/backups.go @@ -43,7 +43,7 @@ func Backups() *schema.Table { func fetchCloudhsmv2Backups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudhsmv2 + svc := cl.Services(client.AWSServiceCloudhsmv2).Cloudhsmv2 var input cloudhsmv2.DescribeBackupsInput paginator := cloudhsmv2.NewDescribeBackupsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go index 2976eb83a2d07b..273e8afd1d0fe8 100644 --- a/plugins/source/aws/resources/services/cloudhsmv2/clusters.go +++ b/plugins/source/aws/resources/services/cloudhsmv2/clusters.go @@ -43,7 +43,7 @@ func Clusters() *schema.Table { func fetchCloudhsmv2Clusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudhsmv2 + svc := cl.Services(client.AWSServiceCloudhsmv2).Cloudhsmv2 var input cloudhsmv2.DescribeClustersInput paginator := cloudhsmv2.NewDescribeClustersPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/cloudtrail/channels.go b/plugins/source/aws/resources/services/cloudtrail/channels.go index aa0b81f80beccd..e29afd6ae26a16 100644 --- a/plugins/source/aws/resources/services/cloudtrail/channels.go +++ b/plugins/source/aws/resources/services/cloudtrail/channels.go @@ -36,7 +36,7 @@ func Channels() *schema.Table { func fetchCloudtrailChannels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail paginator := cloudtrail.NewListChannelsPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudtrail.Options) { @@ -52,7 +52,7 @@ func fetchCloudtrailChannels(ctx context.Context, meta schema.ClientMeta, parent func getChannel(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail item := resource.Item.(types.Channel) params := cloudtrail.GetChannelInput{ diff --git a/plugins/source/aws/resources/services/cloudtrail/events.go b/plugins/source/aws/resources/services/cloudtrail/events.go index 5dd356a5aad46e..081a989d2fd01b 100644 --- a/plugins/source/aws/resources/services/cloudtrail/events.go +++ b/plugins/source/aws/resources/services/cloudtrail/events.go @@ -47,7 +47,7 @@ func Events() *schema.Table { func fetchCloudtrailEvents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail allConfigs := []tableoptions.CustomLookupEventsOpts{{}} if cl.Spec.TableOptions.CloudTrailEvents != nil { diff --git a/plugins/source/aws/resources/services/cloudtrail/imports.go b/plugins/source/aws/resources/services/cloudtrail/imports.go index 1ec31b42b984c4..7b5356eb75f108 100644 --- a/plugins/source/aws/resources/services/cloudtrail/imports.go +++ b/plugins/source/aws/resources/services/cloudtrail/imports.go @@ -38,7 +38,7 @@ func Imports() *schema.Table { func fetchImports(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail paginator := cloudtrail.NewListImportsPaginator(svc, nil) for paginator.HasMorePages() { @@ -55,7 +55,7 @@ func fetchImports(ctx context.Context, meta schema.ClientMeta, parent *schema.Re func getImport(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail item := resource.Item.(types.ImportsListItem) importOutput, err := svc.GetImport(ctx, &cloudtrail.GetImportInput{ImportId: item.ImportId}, func(options *cloudtrail.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go b/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go index a7c23cda930fc6..242e984ec30584 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go +++ b/plugins/source/aws/resources/services/cloudtrail/trail_event_selectors.go @@ -34,7 +34,7 @@ func trailEventSelectors() *schema.Table { func fetchCloudtrailTrailEventSelectors(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.CloudTrailWrapper) cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail response, err := svc.GetEventSelectors(ctx, &cloudtrail.GetEventSelectorsInput{TrailName: r.TrailARN}, func(options *cloudtrail.Options) { options.Region = *r.HomeRegion }) diff --git a/plugins/source/aws/resources/services/cloudtrail/trails.go b/plugins/source/aws/resources/services/cloudtrail/trails.go index ea6614e62ad5ac..cd6b8a07e47f79 100644 --- a/plugins/source/aws/resources/services/cloudtrail/trails.go +++ b/plugins/source/aws/resources/services/cloudtrail/trails.go @@ -57,7 +57,7 @@ var groupNameRegex = regexp.MustCompile("arn:[a-zA-Z0-9-]+:logs:[a-z0-9-]+:[0-9] func fetchCloudtrailTrails(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail log := cl.Logger() response, err := svc.DescribeTrails(ctx, nil, func(options *cloudtrail.Options) { options.Region = cl.Region @@ -145,7 +145,7 @@ func fetchCloudtrailTrails(ctx context.Context, meta schema.ClientMeta, parent * func resolveCloudTrailStatus(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudtrail + svc := cl.Services(client.AWSServiceCloudtrail).Cloudtrail r := resource.Item.(*models.CloudTrailWrapper) response, err := svc.GetTrailStatus(ctx, &cloudtrail.GetTrailStatusInput{Name: r.TrailARN}, func(o *cloudtrail.Options) { diff --git a/plugins/source/aws/resources/services/cloudwatch/alarms.go b/plugins/source/aws/resources/services/cloudwatch/alarms.go index 2bd22a8b58195c..cc7df756e67402 100644 --- a/plugins/source/aws/resources/services/cloudwatch/alarms.go +++ b/plugins/source/aws/resources/services/cloudwatch/alarms.go @@ -47,7 +47,7 @@ func Alarms() *schema.Table { func fetchCloudwatchAlarms(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudwatch.DescribeAlarmsInput cl := meta.(*client.Client) - svc := cl.Services().Cloudwatch + svc := cl.Services(client.AWSServiceCloudwatch).Cloudwatch paginator := cloudwatch.NewDescribeAlarmsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudwatch.Options) { @@ -71,7 +71,7 @@ func resolveCloudwatchAlarmDimensions(ctx context.Context, meta schema.ClientMet func resolveCloudwatchAlarmTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Cloudwatch + svc := cl.Services(client.AWSServiceCloudwatch).Cloudwatch alarm := resource.Item.(types.MetricAlarm) input := cloudwatch.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/cloudwatch/metric_statistics.go b/plugins/source/aws/resources/services/cloudwatch/metric_statistics.go index 1fd32e795cb91f..29210a539fa72a 100644 --- a/plugins/source/aws/resources/services/cloudwatch/metric_statistics.go +++ b/plugins/source/aws/resources/services/cloudwatch/metric_statistics.go @@ -74,7 +74,7 @@ func fetchCloudwatchMetricStatistics(ctx context.Context, meta schema.ClientMeta return errors.New("skipping `aws_alpha_cloudwatch_metric_statistics` because `get_metric_statistics` is not specified in `table_options`") } - svc := cl.Services().Cloudwatch + svc := cl.Services(client.AWSServiceCloudwatch).Cloudwatch for _, input := range item.getStatsInputs { input := input diff --git a/plugins/source/aws/resources/services/cloudwatch/metrics.go b/plugins/source/aws/resources/services/cloudwatch/metrics.go index be0ba49aeacad2..92670c8200771a 100644 --- a/plugins/source/aws/resources/services/cloudwatch/metrics.go +++ b/plugins/source/aws/resources/services/cloudwatch/metrics.go @@ -71,7 +71,7 @@ func fetchCloudwatchMetrics(ctx context.Context, meta schema.ClientMeta, parent return errors.New("skipping `aws_alpha_cloudwatch_metrics` because `list_metrics` is not specified in `table_options`") } - svc := cl.Services().Cloudwatch + svc := cl.Services(client.AWSServiceCloudwatch).Cloudwatch for _, input := range cl.Spec.TableOptions.CloudwatchMetrics { input := input diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go b/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go index 1508338c8db6af..31c3e0a7d08a99 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/data_protection_policies.go @@ -41,7 +41,7 @@ func fetchDataProtectionPolicy(ctx context.Context, meta schema.ClientMeta, pare LogGroupIdentifier: lg.LogGroupName, } cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs resp, err := svc.GetDataProtectionPolicy(ctx, &config, func(options *cloudwatchlogs.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go index cc5f2feac41493..97bf842b3c8cdf 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/log_groups.go @@ -46,7 +46,7 @@ func LogGroups() *schema.Table { func fetchCloudwatchlogsLogGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudwatchlogs.DescribeLogGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs paginator := cloudwatchlogs.NewDescribeLogGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudwatchlogs.Options) { @@ -63,7 +63,7 @@ func fetchCloudwatchlogsLogGroups(ctx context.Context, meta schema.ClientMeta, p func resolveLogGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { lg := resource.Item.(types.LogGroup) cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs out, err := svc.ListTagsLogGroup(ctx, &cloudwatchlogs.ListTagsLogGroupInput{LogGroupName: lg.LogGroupName}, func(options *cloudwatchlogs.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go index f493ee6ecf15a5..8ef1ad03ff3a94 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/metric_filters.go @@ -37,7 +37,7 @@ func MetricFilters() *schema.Table { func fetchCloudwatchlogsMetricFilters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudwatchlogs.DescribeMetricFiltersInput cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs paginator := cloudwatchlogs.NewDescribeMetricFiltersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudwatchlogs.Options) { diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go index 3a51f7acb239f9..2a6584612f6190 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/resource_policies.go @@ -43,7 +43,7 @@ func ResourcePolicies() *schema.Table { func fetchCloudwatchlogsResourcePolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config cloudwatchlogs.DescribeResourcePoliciesInput cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs // No paginator available for { response, err := svc.DescribeResourcePolicies(ctx, &config, func(options *cloudwatchlogs.Options) { diff --git a/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go b/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go index 06bb8585c17bb4..30f052578f35d7 100644 --- a/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go +++ b/plugins/source/aws/resources/services/cloudwatchlogs/subscription_filters.go @@ -36,7 +36,7 @@ func fetchCloudwatchlogsSubscriptionFilters(ctx context.Context, meta schema.Cli LogGroupName: parent.Item.(types.LogGroup).LogGroupName, } cl := meta.(*client.Client) - svc := cl.Services().Cloudwatchlogs + svc := cl.Services(client.AWSServiceCloudwatchlogs).Cloudwatchlogs paginator := cloudwatchlogs.NewDescribeSubscriptionFiltersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *cloudwatchlogs.Options) { diff --git a/plugins/source/aws/resources/services/codeartifact/domains.go b/plugins/source/aws/resources/services/codeartifact/domains.go index d5cf589f28a726..e17b18c4a707b1 100644 --- a/plugins/source/aws/resources/services/codeartifact/domains.go +++ b/plugins/source/aws/resources/services/codeartifact/domains.go @@ -47,7 +47,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func fetchDomains(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codeartifact + svc := cl.Services(client.AWSServiceCodeartifact).Codeartifact paginator := codeartifact.NewListDomainsPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *codeartifact.Options) { @@ -64,7 +64,7 @@ func fetchDomains(ctx context.Context, meta schema.ClientMeta, parent *schema.Re func getDomain(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { domain := resource.Item.(types.DomainSummary) cl := meta.(*client.Client) - svc := cl.Services().Codeartifact + svc := cl.Services(client.AWSServiceCodeartifact).Codeartifact domainOutput, err := svc.DescribeDomain(ctx, &codeartifact.DescribeDomainInput{Domain: domain.Name}, func(options *codeartifact.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/codeartifact/helpers.go b/plugins/source/aws/resources/services/codeartifact/helpers.go index 9b6ee6cf5d6a3e..59e419bc52270b 100644 --- a/plugins/source/aws/resources/services/codeartifact/helpers.go +++ b/plugins/source/aws/resources/services/codeartifact/helpers.go @@ -14,7 +14,7 @@ func resolveCodeartifactTags(path string) schema.ColumnResolver { return func(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { arn := funk.Get(r.Item, path, funk.WithAllowZero()).(*string) cl := meta.(*client.Client) - svc := cl.Services().Codeartifact + svc := cl.Services(client.AWSServiceCodeartifact).Codeartifact params := codeartifact.ListTagsForResourceInput{ResourceArn: arn} output, err := svc.ListTagsForResource(ctx, ¶ms, func(options *codeartifact.Options) { diff --git a/plugins/source/aws/resources/services/codeartifact/repositories.go b/plugins/source/aws/resources/services/codeartifact/repositories.go index 49834ab4af1703..e9034e140ef030 100644 --- a/plugins/source/aws/resources/services/codeartifact/repositories.go +++ b/plugins/source/aws/resources/services/codeartifact/repositories.go @@ -48,7 +48,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func fetchRepositories(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codeartifact + svc := cl.Services(client.AWSServiceCodeartifact).Codeartifact paginator := codeartifact.NewListRepositoriesPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *codeartifact.Options) { @@ -65,7 +65,7 @@ func fetchRepositories(ctx context.Context, meta schema.ClientMeta, parent *sche func getRepository(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { repository := resource.Item.(types.RepositorySummary) cl := meta.(*client.Client) - svc := cl.Services().Codeartifact + svc := cl.Services(client.AWSServiceCodeartifact).Codeartifact repoOut, err := svc.DescribeRepository(ctx, &codeartifact.DescribeRepositoryInput{ Repository: repository.Name, Domain: repository.DomainName, diff --git a/plugins/source/aws/resources/services/codebuild/builds.go b/plugins/source/aws/resources/services/codebuild/builds.go index cc129126dec3a3..9b174c20518bb5 100644 --- a/plugins/source/aws/resources/services/codebuild/builds.go +++ b/plugins/source/aws/resources/services/codebuild/builds.go @@ -25,7 +25,7 @@ func builds() *schema.Table { func fetchBuildsForProject(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codebuild + svc := cl.Services(client.AWSServiceCodebuild).Codebuild project := parent.Item.(types.Project) config := codebuild.ListBuildsForProjectInput{ ProjectName: project.Name, diff --git a/plugins/source/aws/resources/services/codebuild/projects.go b/plugins/source/aws/resources/services/codebuild/projects.go index eeb976f603d193..7770abec66cf42 100644 --- a/plugins/source/aws/resources/services/codebuild/projects.go +++ b/plugins/source/aws/resources/services/codebuild/projects.go @@ -44,7 +44,7 @@ func Projects() *schema.Table { func fetchCodebuildProjects(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codebuild + svc := cl.Services(client.AWSServiceCodebuild).Codebuild config := codebuild.ListProjectsInput{} paginator := codebuild.NewListProjectsPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/codebuild/source_credentials.go b/plugins/source/aws/resources/services/codebuild/source_credentials.go index 28cdd7fcf4bac2..335fdd817fd13f 100644 --- a/plugins/source/aws/resources/services/codebuild/source_credentials.go +++ b/plugins/source/aws/resources/services/codebuild/source_credentials.go @@ -27,7 +27,7 @@ func SourceCredentials() *schema.Table { func fetchSourceCredentials(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codebuild + svc := cl.Services(client.AWSServiceCodebuild).Codebuild credentialsOutput, err := svc.ListSourceCredentials(ctx, nil, func(options *codebuild.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/codecommit/repositories.go b/plugins/source/aws/resources/services/codecommit/repositories.go index d4b6dbed955149..56f4196444973b 100644 --- a/plugins/source/aws/resources/services/codecommit/repositories.go +++ b/plugins/source/aws/resources/services/codecommit/repositories.go @@ -35,7 +35,9 @@ func Repositories() *schema.Table { func fetchRepositories(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codecommit + svc := cl.Services(client.AWSServiceCodecommit).Codecommit + // Note: this API doesn't support limiting the number of results in a single call and the nested BatchRepositories doesn't have a listed limit + // So we are assuming that the number of repositories is not too large and we can fetch (`BatchGet`) all of their details in a single call config := codecommit.ListRepositoriesInput{} paginator := codecommit.NewListRepositoriesPaginator(svc, &config) for paginator.HasMorePages() { @@ -72,7 +74,7 @@ func fetchRepositories(ctx context.Context, meta schema.ClientMeta, parent *sche func resolveCodecommitTags(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Codecommit + svc := cl.Services(client.AWSServiceCodecommit).Codecommit params := codecommit.ListTagsForResourceInput{ResourceArn: r.Item.(types.RepositoryMetadata).Arn} tags := make(map[string]string) for { diff --git a/plugins/source/aws/resources/services/codepipeline/pipelines.go b/plugins/source/aws/resources/services/codepipeline/pipelines.go index 29d6468e3a7acc..bb8fca307f782a 100644 --- a/plugins/source/aws/resources/services/codepipeline/pipelines.go +++ b/plugins/source/aws/resources/services/codepipeline/pipelines.go @@ -43,7 +43,7 @@ func Pipelines() *schema.Table { func fetchCodepipelinePipelines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codepipeline + svc := cl.Services(client.AWSServiceCodepipeline).Codepipeline config := codepipeline.ListPipelinesInput{} paginator := codepipeline.NewListPipelinesPaginator(svc, &config) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchCodepipelinePipelines(ctx context.Context, meta schema.ClientMeta, par func getPipeline(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Codepipeline + svc := cl.Services(client.AWSServiceCodepipeline).Codepipeline item := resource.Item.(types.PipelineSummary) response, err := svc.GetPipeline(ctx, &codepipeline.GetPipelineInput{Name: item.Name}, func(options *codepipeline.Options) { options.Region = cl.Region @@ -76,7 +76,7 @@ func resolvePipelineTags(ctx context.Context, meta schema.ClientMeta, resource * pipeline := resource.Item.(*codepipeline.GetPipelineOutput) cl := meta.(*client.Client) - svc := cl.Services().Codepipeline + svc := cl.Services(client.AWSServiceCodepipeline).Codepipeline paginator := codepipeline.NewListTagsForResourcePaginator(svc, &codepipeline.ListTagsForResourceInput{ ResourceArn: pipeline.Metadata.PipelineArn, }) diff --git a/plugins/source/aws/resources/services/codepipeline/webhooks.go b/plugins/source/aws/resources/services/codepipeline/webhooks.go index 74578fd3989105..fccb3db5d6e341 100644 --- a/plugins/source/aws/resources/services/codepipeline/webhooks.go +++ b/plugins/source/aws/resources/services/codepipeline/webhooks.go @@ -41,7 +41,7 @@ func Webhooks() *schema.Table { func fetchCodepipelineWebhooks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Codepipeline + svc := cl.Services(client.AWSServiceCodepipeline).Codepipeline paginator := codepipeline.NewListWebhooksPaginator(svc, &codepipeline.ListWebhooksInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *codepipeline.Options) { diff --git a/plugins/source/aws/resources/services/cognito/identity_pools.go b/plugins/source/aws/resources/services/cognito/identity_pools.go index 7232c44536e211..c6bd3b44bc8370 100644 --- a/plugins/source/aws/resources/services/cognito/identity_pools.go +++ b/plugins/source/aws/resources/services/cognito/identity_pools.go @@ -48,7 +48,7 @@ func IdentityPools() *schema.Table { func fetchCognitoIdentityPools(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentity + svc := cl.Services(client.AWSServiceCognitoidentity).Cognitoidentity params := cognitoidentity.ListIdentityPoolsInput{ // we want max results to reduce List calls as much as possible, services limited to less than or equal to 60" MaxResults: 60, @@ -68,7 +68,7 @@ func fetchCognitoIdentityPools(ctx context.Context, meta schema.ClientMeta, pare func getIdentityPool(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentity + svc := cl.Services(client.AWSServiceCognitoidentity).Cognitoidentity item := resource.Item.(types.IdentityPoolShortDescription) ipo, err := svc.DescribeIdentityPool(ctx, &cognitoidentity.DescribeIdentityPoolInput{IdentityPoolId: item.IdentityPoolId}, func(options *cognitoidentity.Options) { diff --git a/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go b/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go index f2d43825da558e..3b61a00f080662 100644 --- a/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go +++ b/plugins/source/aws/resources/services/cognito/user_pool_identity_providers.go @@ -34,7 +34,7 @@ func userPoolIdentityProviders() *schema.Table { func fetchCognitoUserPoolIdentityProviders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { pool := parent.Item.(*types.UserPoolType) cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentityprovider + svc := cl.Services(client.AWSServiceCognitoidentityprovider).Cognitoidentityprovider params := cognitoidentityprovider.ListIdentityProvidersInput{UserPoolId: pool.Id} paginator := cognitoidentityprovider.NewListIdentityProvidersPaginator(svc, ¶ms) @@ -52,7 +52,7 @@ func fetchCognitoUserPoolIdentityProviders(ctx context.Context, meta schema.Clie func getUserPoolIdentityProvider(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentityprovider + svc := cl.Services(client.AWSServiceCognitoidentityprovider).Cognitoidentityprovider item := resource.Item.(types.ProviderDescription) pool := resource.Parent.Item.(*types.UserPoolType) diff --git a/plugins/source/aws/resources/services/cognito/user_pools.go b/plugins/source/aws/resources/services/cognito/user_pools.go index 8dec8a9a68d280..d3d4a09f925b80 100644 --- a/plugins/source/aws/resources/services/cognito/user_pools.go +++ b/plugins/source/aws/resources/services/cognito/user_pools.go @@ -39,7 +39,7 @@ func UserPools() *schema.Table { func fetchCognitoUserPools(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentityprovider + svc := cl.Services(client.AWSServiceCognitoidentityprovider).Cognitoidentityprovider params := cognitoidentityprovider.ListUserPoolsInput{ // we want max results to reduce List calls as much as possible, services limited to less than or equal to 60" MaxResults: 60, @@ -59,7 +59,7 @@ func fetchCognitoUserPools(ctx context.Context, meta schema.ClientMeta, parent * func getUserPool(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Cognitoidentityprovider + svc := cl.Services(client.AWSServiceCognitoidentityprovider).Cognitoidentityprovider item := resource.Item.(types.UserPoolDescriptionType) upo, err := svc.DescribeUserPool(ctx, &cognitoidentityprovider.DescribeUserPoolInput{UserPoolId: item.Id}, func(options *cognitoidentityprovider.Options) { diff --git a/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go index 12878ac67879f1..ac00cdb5c636ac 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/autoscaling_groups_recommendations.go @@ -27,8 +27,7 @@ func AutoscalingGroupsRecommendations() *schema.Table { func fetchAutoscalingGroupsRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Computeoptimizer + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer input := computeoptimizer.GetAutoScalingGroupRecommendationsInput{ MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go index 0433bd164318a9..f86eac667ba110 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ebs_volume_recommendations.go @@ -35,7 +35,7 @@ func EbsVolumeRecommendations() *schema.Table { func fetchEbsVolumeRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Computeoptimizer + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer input := computeoptimizer.GetEBSVolumeRecommendationsInput{ MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go index 266ab28e70f146..ad0672e4337f0f 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ec2_instance_recommendations.go @@ -33,7 +33,7 @@ func Ec2InstanceRecommendations() *schema.Table { func fetchEc2InstanceRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Computeoptimizer + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer input := computeoptimizer.GetEC2InstanceRecommendationsInput{ MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go index 80ca4995186836..6d45dc0f3cc292 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/ecs_service_recommendations.go @@ -33,8 +33,7 @@ func EcsServiceRecommendations() *schema.Table { func fetchEcsServiceRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Computeoptimizer + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer input := computeoptimizer.GetECSServiceRecommendationsInput{ MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/computeoptimizer/enrollment_status.go b/plugins/source/aws/resources/services/computeoptimizer/enrollment_status.go index 15acb4a2ecfee2..f32bcd9b2accb0 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/enrollment_status.go +++ b/plugins/source/aws/resources/services/computeoptimizer/enrollment_status.go @@ -25,9 +25,7 @@ func EnrollmentStatuses() *schema.Table { func fetchEnrollmentStatus(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Computeoptimizer - + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer output, err := svc.GetEnrollmentStatus(ctx, &computeoptimizer.GetEnrollmentStatusInput{}, func(options *computeoptimizer.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go b/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go index 6f38524858f099..bb2232c9135367 100644 --- a/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go +++ b/plugins/source/aws/resources/services/computeoptimizer/lambda_functions_recommendations.go @@ -33,8 +33,7 @@ func LambdaFunctionsRecommendations() *schema.Table { func fetchLambdaFunctionsRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - s := cl.Services() - svc := s.Computeoptimizer + svc := cl.Services(client.AWSServiceComputeoptimizer).Computeoptimizer input := computeoptimizer.GetLambdaFunctionRecommendationsInput{ MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/config/config_rule_compliance_details.go b/plugins/source/aws/resources/services/config/config_rule_compliance_details.go index ace926ce2fe4a4..deeec967f95346 100644 --- a/plugins/source/aws/resources/services/config/config_rule_compliance_details.go +++ b/plugins/source/aws/resources/services/config/config_rule_compliance_details.go @@ -37,7 +37,7 @@ func configRuleComplianceDetails() *schema.Table { func fetchConfigConfigRuleComplianceDetails(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { ruleDetail := parent.Item.(types.ConfigRule) cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice input := &configservice.GetComplianceDetailsByConfigRuleInput{ ConfigRuleName: ruleDetail.ConfigRuleName, diff --git a/plugins/source/aws/resources/services/config/config_rule_compliances.go b/plugins/source/aws/resources/services/config/config_rule_compliances.go index 684dbda46d4d76..cda0ba0951c916 100644 --- a/plugins/source/aws/resources/services/config/config_rule_compliances.go +++ b/plugins/source/aws/resources/services/config/config_rule_compliances.go @@ -28,7 +28,7 @@ func configRuleCompliances() *schema.Table { func fetchConfigConfigRuleCompliances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { ruleDetail := parent.Item.(types.ConfigRule) cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice input := &configservice.DescribeComplianceByConfigRuleInput{ ConfigRuleNames: []string{aws.ToString(ruleDetail.ConfigRuleName)}, diff --git a/plugins/source/aws/resources/services/config/config_rules.go b/plugins/source/aws/resources/services/config/config_rules.go index 3bbd7b3e971cb6..f758aa2c2e61f7 100644 --- a/plugins/source/aws/resources/services/config/config_rules.go +++ b/plugins/source/aws/resources/services/config/config_rules.go @@ -40,7 +40,7 @@ func ConfigRules() *schema.Table { func fetchConfigConfigRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice p := configservice.NewDescribeConfigRulesPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/config/configuration_aggregators.go b/plugins/source/aws/resources/services/config/configuration_aggregators.go index febd1be5f4fbf6..7e57a61453ace0 100644 --- a/plugins/source/aws/resources/services/config/configuration_aggregators.go +++ b/plugins/source/aws/resources/services/config/configuration_aggregators.go @@ -35,7 +35,7 @@ func ConfigurationAggregators() *schema.Table { func fetchConfigurationAggregators(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice p := configservice.NewDescribeConfigurationAggregatorsPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/config/configuration_recorders.go b/plugins/source/aws/resources/services/config/configuration_recorders.go index 12b74bd7c3de31..546880947bf3fa 100644 --- a/plugins/source/aws/resources/services/config/configuration_recorders.go +++ b/plugins/source/aws/resources/services/config/configuration_recorders.go @@ -38,7 +38,7 @@ func ConfigurationRecorders() *schema.Table { func fetchConfigConfigurationRecorders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice resp, err := svc.DescribeConfigurationRecorders(ctx, &configservice.DescribeConfigurationRecordersInput{}, func(options *configservice.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go b/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go index 5685b52268b271..4e68da28087342 100644 --- a/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go +++ b/plugins/source/aws/resources/services/config/conformance_pack_rule_compliances.go @@ -34,7 +34,7 @@ func conformancePackRuleCompliances() *schema.Table { func fetchConfigConformancePackRuleCompliances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { conformancePackDetail := parent.Item.(types.ConformancePackDetail) cl := meta.(*client.Client) - cs := cl.Services().Configservice + cs := cl.Services(client.AWSServiceConfigservice).Configservice params := configservice.DescribeConformancePackComplianceInput{ ConformancePackName: conformancePackDetail.ConformancePackName, } diff --git a/plugins/source/aws/resources/services/config/conformance_packs.go b/plugins/source/aws/resources/services/config/conformance_packs.go index 02c13756ebdd22..4efa35522536ab 100644 --- a/plugins/source/aws/resources/services/config/conformance_packs.go +++ b/plugins/source/aws/resources/services/config/conformance_packs.go @@ -42,7 +42,7 @@ func fetchConfigConformancePacks(ctx context.Context, meta schema.ClientMeta, pa cl := meta.(*client.Client) config := configservice.DescribeConformancePacksInput{} var ae smithy.APIError - configService := cl.Services().Configservice + configService := cl.Services(client.AWSServiceConfigservice).Configservice paginator := configservice.NewDescribeConformancePacksPaginator(configService, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *configservice.Options) { diff --git a/plugins/source/aws/resources/services/config/deliver_channel_statuses.go b/plugins/source/aws/resources/services/config/deliver_channel_statuses.go index 55fa4b3db318d2..0448f7317eae58 100644 --- a/plugins/source/aws/resources/services/config/deliver_channel_statuses.go +++ b/plugins/source/aws/resources/services/config/deliver_channel_statuses.go @@ -28,7 +28,7 @@ func deliveryChannelStatuses() *schema.Table { func fetchDeliveryChannelStatuses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { ruleDetail := parent.Item.(types.DeliveryChannel) cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice input := &configservice.DescribeDeliveryChannelStatusInput{ DeliveryChannelNames: []string{aws.ToString(ruleDetail.Name)}, diff --git a/plugins/source/aws/resources/services/config/delivery_channels.go b/plugins/source/aws/resources/services/config/delivery_channels.go index 9d03fb5f06fca6..70b408deaaecfc 100644 --- a/plugins/source/aws/resources/services/config/delivery_channels.go +++ b/plugins/source/aws/resources/services/config/delivery_channels.go @@ -31,7 +31,7 @@ func DeliveryChannels() *schema.Table { func fetchDeliveryChannels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice response, err := svc.DescribeDeliveryChannels(ctx, &configservice.DescribeDeliveryChannelsInput{}, func(options *configservice.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/config/remediation_configurations.go b/plugins/source/aws/resources/services/config/remediation_configurations.go index 4178c5cd08ec47..233b7565c35885 100644 --- a/plugins/source/aws/resources/services/config/remediation_configurations.go +++ b/plugins/source/aws/resources/services/config/remediation_configurations.go @@ -28,7 +28,7 @@ func remediationConfigurations() *schema.Table { func fetchRemediationConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice configRule := parent.Item.(types.ConfigRule).ConfigRuleName input := &configservice.DescribeRemediationConfigurationsInput{ diff --git a/plugins/source/aws/resources/services/config/retention_configurations.go b/plugins/source/aws/resources/services/config/retention_configurations.go index 9669e23c70d6a6..68046527345da6 100644 --- a/plugins/source/aws/resources/services/config/retention_configurations.go +++ b/plugins/source/aws/resources/services/config/retention_configurations.go @@ -29,7 +29,7 @@ func RetentionConfigurations() *schema.Table { func fetchRetentionConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Configservice + svc := cl.Services(client.AWSServiceConfigservice).Configservice p := configservice.NewDescribeRetentionConfigurationsPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/costexplorer/cost_custom.go b/plugins/source/aws/resources/services/costexplorer/cost_custom.go index 6eb0b3c45a2445..3c8b8952726c23 100644 --- a/plugins/source/aws/resources/services/costexplorer/cost_custom.go +++ b/plugins/source/aws/resources/services/costexplorer/cost_custom.go @@ -80,7 +80,7 @@ func fetchCustom(ctx context.Context, meta schema.ClientMeta, parent *schema.Res return fmt.Errorf("skipping `%s` because `get_cost_and_usage` is not specified in `table_options`", tableName) } - svc := cl.Services().Costexplorer + svc := cl.Services(client.AWSServiceCostexplorer).Costexplorer allConfigs := cl.Spec.TableOptions.CustomCostExplorer.GetCostAndUsageOpts for _, input := range allConfigs { hash, err := hashstructure.Hash(input, hashstructure.FormatV2, nil) diff --git a/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go b/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go index 67f1a5fd846e62..ca18c9f40796ac 100644 --- a/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go +++ b/plugins/source/aws/resources/services/costexplorer/cost_thirty_days.go @@ -50,7 +50,7 @@ func fetchCost(ctx context.Context, meta schema.ClientMeta, parent *schema.Resou cl.Logger().Info().Msg("skipping `aws_costexplorer_cost_current_month` because `use_paid_apis` is set to false") return nil } - svc := cl.Services().Costexplorer + svc := cl.Services(client.AWSServiceCostexplorer).Costexplorer // Only use a single `time.Now()` call to ensure that the start and end dates are the same. now := time.Now() diff --git a/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go b/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go index d0f79c5981c608..ceba69cfdfcd90 100644 --- a/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go +++ b/plugins/source/aws/resources/services/costexplorer/forecast_thirty_days.go @@ -50,7 +50,7 @@ func fetchForecast(ctx context.Context, meta schema.ClientMeta, parent *schema.R return nil } now := time.Now() - svc := cl.Services().Costexplorer + svc := cl.Services(client.AWSServiceCostexplorer).Costexplorer input := costexplorer.GetCostForecastInput{ Granularity: types.GranularityDaily, diff --git a/plugins/source/aws/resources/services/dax/clusters.go b/plugins/source/aws/resources/services/dax/clusters.go index 6dce5df2b0835a..5e4fc6a9d3528f 100644 --- a/plugins/source/aws/resources/services/dax/clusters.go +++ b/plugins/source/aws/resources/services/dax/clusters.go @@ -42,7 +42,7 @@ func Clusters() *schema.Table { func fetchDaxClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dax + svc := cl.Services(client.AWSServiceDax).Dax config := dax.DescribeClustersInput{} // No paginator available for { @@ -67,7 +67,7 @@ func resolveClusterTags(ctx context.Context, meta schema.ClientMeta, resource *s cluster := resource.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Dax + svc := cl.Services(client.AWSServiceDax).Dax input := &dax.ListTagsInput{ ResourceName: cluster.ClusterArn, } diff --git a/plugins/source/aws/resources/services/detective/graphs.go b/plugins/source/aws/resources/services/detective/graphs.go index 7aabe2301794a1..33d0907d16bf4a 100644 --- a/plugins/source/aws/resources/services/detective/graphs.go +++ b/plugins/source/aws/resources/services/detective/graphs.go @@ -37,7 +37,7 @@ func Graphs() *schema.Table { func fetchGraphs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Detective + svc := cl.Services(client.AWSServiceDetective).Detective config := detective.ListGraphsInput{} paginator := detective.NewListGraphsPaginator(svc, &config) for paginator.HasMorePages() { @@ -56,7 +56,7 @@ func fetchGraphs(ctx context.Context, meta schema.ClientMeta, parent *schema.Res func resolveGraphTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { graph := resource.Item.(types.Graph) cl := meta.(*client.Client) - svc := cl.Services().Detective + svc := cl.Services(client.AWSServiceDetective).Detective input := &detective.ListTagsForResourceInput{ ResourceArn: graph.Arn, } diff --git a/plugins/source/aws/resources/services/detective/members.go b/plugins/source/aws/resources/services/detective/members.go index b7ead4222c8b98..31a432edcdd3e6 100644 --- a/plugins/source/aws/resources/services/detective/members.go +++ b/plugins/source/aws/resources/services/detective/members.go @@ -39,7 +39,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func fetchMembers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Detective + svc := cl.Services(client.AWSServiceDetective).Detective graph := parent.Item.(types.Graph) config := detective.ListMembersInput{ GraphArn: graph.Arn, diff --git a/plugins/source/aws/resources/services/directconnect/connections.go b/plugins/source/aws/resources/services/directconnect/connections.go index 611f8b541c77e4..debfd74bd61c1e 100644 --- a/plugins/source/aws/resources/services/directconnect/connections.go +++ b/plugins/source/aws/resources/services/directconnect/connections.go @@ -48,7 +48,7 @@ func Connections() *schema.Table { func fetchDirectconnectConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeConnectionsInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect output, err := svc.DescribeConnections(ctx, &config, func(options *directconnect.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/directconnect/gateway_associations.go b/plugins/source/aws/resources/services/directconnect/gateway_associations.go index f8fa3a1cc45b7f..37647a89f8ad0b 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_associations.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_associations.go @@ -39,7 +39,7 @@ func gatewayAssociations() *schema.Table { func fetchDirectconnectGatewayAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { gateway := parent.Item.(types.DirectConnectGateway) cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect config := directconnect.DescribeDirectConnectGatewayAssociationsInput{DirectConnectGatewayId: gateway.DirectConnectGatewayId} // No paginator available for { diff --git a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go index 149c68103fcbd1..b49f853e9ee542 100644 --- a/plugins/source/aws/resources/services/directconnect/gateway_attachments.go +++ b/plugins/source/aws/resources/services/directconnect/gateway_attachments.go @@ -39,7 +39,7 @@ func gatewayAttachments() *schema.Table { func fetchDirectconnectGatewayAttachments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { gateway := parent.Item.(types.DirectConnectGateway) cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect config := directconnect.DescribeDirectConnectGatewayAttachmentsInput{DirectConnectGatewayId: gateway.DirectConnectGatewayId} // No paginator available for { diff --git a/plugins/source/aws/resources/services/directconnect/gateways.go b/plugins/source/aws/resources/services/directconnect/gateways.go index ee2e47fdfd19e8..1cf9df96c2ff4a 100644 --- a/plugins/source/aws/resources/services/directconnect/gateways.go +++ b/plugins/source/aws/resources/services/directconnect/gateways.go @@ -47,7 +47,7 @@ func Gateways() *schema.Table { func fetchDirectconnectGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeDirectConnectGatewaysInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect // No paginator available for { output, err := svc.DescribeDirectConnectGateways(ctx, &config, func(options *directconnect.Options) { diff --git a/plugins/source/aws/resources/services/directconnect/lags.go b/plugins/source/aws/resources/services/directconnect/lags.go index 77293744c73a44..76a188b32f7a0f 100644 --- a/plugins/source/aws/resources/services/directconnect/lags.go +++ b/plugins/source/aws/resources/services/directconnect/lags.go @@ -47,7 +47,7 @@ func Lags() *schema.Table { func fetchDirectconnectLags(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeLagsInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect output, err := svc.DescribeLags(ctx, &config, func(options *directconnect.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/directconnect/locations.go b/plugins/source/aws/resources/services/directconnect/locations.go index 47cf170ab089ca..f785ed135363d4 100644 --- a/plugins/source/aws/resources/services/directconnect/locations.go +++ b/plugins/source/aws/resources/services/directconnect/locations.go @@ -28,7 +28,7 @@ func Locations() *schema.Table { func fetchDirectConnectLocations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeLocationsInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect output, err := svc.DescribeLocations(ctx, &config, func(options *directconnect.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go index 36859d9b45eed9..256d80fdce9a26 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_gateways.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_gateways.go @@ -35,7 +35,7 @@ func VirtualGateways() *schema.Table { func fetchDirectconnectVirtualGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeVirtualGatewaysInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect output, err := svc.DescribeVirtualGateways(ctx, &config, func(options *directconnect.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go index 698e4a4447d02a..2dc38f36ac7f2f 100644 --- a/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go +++ b/plugins/source/aws/resources/services/directconnect/virtual_interfaces.go @@ -47,7 +47,7 @@ func VirtualInterfaces() *schema.Table { func fetchDirectconnectVirtualInterfaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config directconnect.DescribeVirtualInterfacesInput cl := meta.(*client.Client) - svc := cl.Services().Directconnect + svc := cl.Services(client.AWSServiceDirectconnect).Directconnect output, err := svc.DescribeVirtualInterfaces(ctx, &config, func(options *directconnect.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/dms/replication_instances.go b/plugins/source/aws/resources/services/dms/replication_instances.go index 06c60562296405..07c013bd3412ef 100644 --- a/plugins/source/aws/resources/services/dms/replication_instances.go +++ b/plugins/source/aws/resources/services/dms/replication_instances.go @@ -34,7 +34,7 @@ func ReplicationInstances() *schema.Table { func fetchDmsReplicationInstances(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Databasemigrationservice + svc := cl.Services(client.AWSServiceDatabasemigrationservice).Databasemigrationservice var describeReplicationInstancesInput *databasemigrationservice.DescribeReplicationInstancesInput describeReplicationInstancesOutput, err := svc.DescribeReplicationInstances(ctx, describeReplicationInstancesInput, func(options *databasemigrationservice.Options) { diff --git a/plugins/source/aws/resources/services/docdb/certificates.go b/plugins/source/aws/resources/services/docdb/certificates.go index 33fb767402209d..14106c630c7853 100644 --- a/plugins/source/aws/resources/services/docdb/certificates.go +++ b/plugins/source/aws/resources/services/docdb/certificates.go @@ -34,7 +34,7 @@ func Certificates() *schema.Table { func fetchDocdbCertificates(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeCertificatesInput{} p := docdb.NewDescribeCertificatesPaginator(svc, input) diff --git a/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go b/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go index 7e3558098febc1..2e83f244e17bb3 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameter_groups.go @@ -56,7 +56,7 @@ func ClusterParameterGroups() *schema.Table { func fetchDocdbClusterParameterGroups(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBClusterParameterGroupsInput{} @@ -76,7 +76,7 @@ func fetchDocdbClusterParameterGroups(ctx context.Context, meta schema.ClientMet func resolveDocdbClusterParameterGroupParameters(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { item := resource.Item.(types.DBClusterParameterGroup) cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBClusterParametersInput{ DBClusterParameterGroupName: item.DBClusterParameterGroupName, diff --git a/plugins/source/aws/resources/services/docdb/cluster_parameters.go b/plugins/source/aws/resources/services/docdb/cluster_parameters.go index 9fa3443531a860..f2b027441a3b52 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_parameters.go +++ b/plugins/source/aws/resources/services/docdb/cluster_parameters.go @@ -28,7 +28,7 @@ func clusterParameters() *schema.Table { func fetchDocdbClusterParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb switch item := parent.Item.(type) { case types.DBClusterParameterGroup: return fetchParameterGroupParameters(ctx, meta, svc, item, res) diff --git a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go index 8198b58a67b0d7..4c9d50ff296dca 100644 --- a/plugins/source/aws/resources/services/docdb/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/docdb/cluster_snapshots.go @@ -56,7 +56,7 @@ func clusterSnapshots() *schema.Table { func fetchDocdbClusterSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { item := parent.Item.(types.DBCluster) cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBClusterSnapshotsInput{ DBClusterIdentifier: item.DBClusterIdentifier, @@ -77,7 +77,7 @@ func fetchDocdbClusterSnapshots(ctx context.Context, meta schema.ClientMeta, par func resolveDocdbClusterSnapshotAttributes(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { item := resource.Item.(types.DBClusterSnapshot) cli := meta.(*client.Client) - svc := cli.Services().Docdb + svc := cli.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBClusterSnapshotAttributesInput{ DBClusterSnapshotIdentifier: item.DBClusterSnapshotIdentifier, diff --git a/plugins/source/aws/resources/services/docdb/clusters.go b/plugins/source/aws/resources/services/docdb/clusters.go index 58e2d04e838f3a..930fbcfb9aa1d6 100644 --- a/plugins/source/aws/resources/services/docdb/clusters.go +++ b/plugins/source/aws/resources/services/docdb/clusters.go @@ -47,7 +47,7 @@ func Clusters() *schema.Table { func fetchDocdbClusters(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := docdb.DescribeDBClustersInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/engine_versions.go b/plugins/source/aws/resources/services/docdb/engine_versions.go index 30919422f13f8a..a78abe30d001b3 100644 --- a/plugins/source/aws/resources/services/docdb/engine_versions.go +++ b/plugins/source/aws/resources/services/docdb/engine_versions.go @@ -34,7 +34,7 @@ func EngineVersions() *schema.Table { func fetchDocdbEngineVersions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBEngineVersionsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/event_categories.go b/plugins/source/aws/resources/services/docdb/event_categories.go index b380356237a685..2858454029dbe4 100644 --- a/plugins/source/aws/resources/services/docdb/event_categories.go +++ b/plugins/source/aws/resources/services/docdb/event_categories.go @@ -38,7 +38,7 @@ func EventCategories() *schema.Table { func fetchDocdbEventCategories(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeEventCategoriesInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/event_subscriptions.go b/plugins/source/aws/resources/services/docdb/event_subscriptions.go index 7a0d9c74402971..352366ce8d40ee 100644 --- a/plugins/source/aws/resources/services/docdb/event_subscriptions.go +++ b/plugins/source/aws/resources/services/docdb/event_subscriptions.go @@ -28,7 +28,7 @@ func EventSubscriptions() *schema.Table { func fetchDocdbEventSubscriptions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeEventSubscriptionsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/events.go b/plugins/source/aws/resources/services/docdb/events.go index bb353981456c79..d18f4e1544f8b4 100644 --- a/plugins/source/aws/resources/services/docdb/events.go +++ b/plugins/source/aws/resources/services/docdb/events.go @@ -27,7 +27,7 @@ func Events() *schema.Table { func fetchDocdbEvents(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeEventsInput{} diff --git a/plugins/source/aws/resources/services/docdb/global_clusters.go b/plugins/source/aws/resources/services/docdb/global_clusters.go index 00ef9cdecc1b0c..4f8fd1290e1db6 100644 --- a/plugins/source/aws/resources/services/docdb/global_clusters.go +++ b/plugins/source/aws/resources/services/docdb/global_clusters.go @@ -34,7 +34,7 @@ func GlobalClusters() *schema.Table { func fetchDocdbGlobalClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeGlobalClustersInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/helpers.go b/plugins/source/aws/resources/services/docdb/helpers.go index cfa81dd7435de1..509651d7d15acb 100644 --- a/plugins/source/aws/resources/services/docdb/helpers.go +++ b/plugins/source/aws/resources/services/docdb/helpers.go @@ -11,7 +11,7 @@ import ( func resolveDocDBTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, name, columnName string) error { cli := meta.(*client.Client) - svc := cli.Services().Docdb + svc := cli.Services(client.AWSServiceDocdb).Docdb response, err := svc.ListTagsForResource(ctx, &docdb.ListTagsForResourceInput{ ResourceName: aws.String(name), diff --git a/plugins/source/aws/resources/services/docdb/instances.go b/plugins/source/aws/resources/services/docdb/instances.go index 1fdb294c8f45ec..d7932a594339f2 100644 --- a/plugins/source/aws/resources/services/docdb/instances.go +++ b/plugins/source/aws/resources/services/docdb/instances.go @@ -42,7 +42,7 @@ func instances() *schema.Table { func fetchDocdbInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { item := parent.Item.(types.DBCluster) cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBInstancesInput{Filters: []types.Filter{{Name: aws.String("db-cluster-id"), Values: []string{*item.DBClusterIdentifier}}}} diff --git a/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go b/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go index 9e606b06bc2298..d0565e90f7843a 100644 --- a/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go +++ b/plugins/source/aws/resources/services/docdb/orderable_db_instance_options.go @@ -24,7 +24,7 @@ func orderableDbInstanceOptions() *schema.Table { func fetchDocdbOrderableDbInstanceOptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { item := parent.Item.(types.DBEngineVersion) cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeOrderableDBInstanceOptionsInput{Engine: item.Engine} diff --git a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go index ee64430e15154a..28d85738886c34 100644 --- a/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go +++ b/plugins/source/aws/resources/services/docdb/pending_maintenance_actions.go @@ -28,7 +28,7 @@ func PendingMaintenanceActions() *schema.Table { func fetchDocdbPendingMaintenanceActions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribePendingMaintenanceActionsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"docdb"}}}, diff --git a/plugins/source/aws/resources/services/docdb/subnet_groups.go b/plugins/source/aws/resources/services/docdb/subnet_groups.go index a79a199eaff901..0e5dbf0856c58e 100644 --- a/plugins/source/aws/resources/services/docdb/subnet_groups.go +++ b/plugins/source/aws/resources/services/docdb/subnet_groups.go @@ -41,7 +41,7 @@ func SubnetGroups() *schema.Table { func fetchDocdbSubnetGroups(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Docdb + svc := cl.Services(client.AWSServiceDocdb).Docdb input := &docdb.DescribeDBSubnetGroupsInput{} diff --git a/plugins/source/aws/resources/services/dynamodb/backups.go b/plugins/source/aws/resources/services/dynamodb/backups.go index db3587913a8e61..5795b4df47eeaf 100644 --- a/plugins/source/aws/resources/services/dynamodb/backups.go +++ b/plugins/source/aws/resources/services/dynamodb/backups.go @@ -36,7 +36,7 @@ func Backups() *schema.Table { func listBackups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb config := dynamodb.ListBackupsInput{} // No paginator available @@ -60,7 +60,7 @@ func listBackups(ctx context.Context, meta schema.ClientMeta, parent *schema.Res func getBackup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb backupSummary := resource.Item.(types.BackupSummary) diff --git a/plugins/source/aws/resources/services/dynamodb/exports.go b/plugins/source/aws/resources/services/dynamodb/exports.go index 5bc2d35951e071..8b94f8c45a6fad 100644 --- a/plugins/source/aws/resources/services/dynamodb/exports.go +++ b/plugins/source/aws/resources/services/dynamodb/exports.go @@ -35,7 +35,7 @@ func Exports() *schema.Table { func listExports(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb paginator := dynamodb.NewListExportsPaginator(svc, &dynamodb.ListExportsInput{}) for paginator.HasMorePages() { @@ -53,7 +53,7 @@ func listExports(ctx context.Context, meta schema.ClientMeta, parent *schema.Res func getExport(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb exportSummary := resource.Item.(types.ExportSummary) diff --git a/plugins/source/aws/resources/services/dynamodb/global_tables.go b/plugins/source/aws/resources/services/dynamodb/global_tables.go index 160287371d8133..84ada14e8f7b84 100644 --- a/plugins/source/aws/resources/services/dynamodb/global_tables.go +++ b/plugins/source/aws/resources/services/dynamodb/global_tables.go @@ -45,7 +45,7 @@ This table only contains version 2017.11.29 (Legacy) Global Tables. See aws_dyna func fetchGlobalTables(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb config := dynamodb.ListGlobalTablesInput{ RegionName: aws.String(cl.Region), @@ -71,7 +71,7 @@ func fetchGlobalTables(ctx context.Context, meta schema.ClientMeta, parent *sche func getGlobalTable(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb table := resource.Item.(types.GlobalTable) @@ -90,7 +90,7 @@ func resolveDynamodbGlobalTableTags(ctx context.Context, meta schema.ClientMeta, table := resource.Item.(*types.GlobalTableDescription) cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb var tags []types.Tag input := &dynamodb.ListTagsOfResourceInput{ ResourceArn: table.GlobalTableArn, diff --git a/plugins/source/aws/resources/services/dynamodb/tables.go b/plugins/source/aws/resources/services/dynamodb/tables.go index 743e93ca5f491f..447ae49b043873 100644 --- a/plugins/source/aws/resources/services/dynamodb/tables.go +++ b/plugins/source/aws/resources/services/dynamodb/tables.go @@ -52,7 +52,7 @@ func Tables() *schema.Table { func fetchDynamodbTables(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb config := dynamodb.ListTablesInput{} // No paginator available @@ -76,7 +76,7 @@ func fetchDynamodbTables(ctx context.Context, meta schema.ClientMeta, parent *sc func getTable(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb tableName := resource.Item.(string) @@ -95,7 +95,7 @@ func resolveDynamodbTableTags(ctx context.Context, meta schema.ClientMeta, resou table := resource.Item.(*types.TableDescription) cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb var tags []types.Tag input := &dynamodb.ListTagsOfResourceInput{ ResourceArn: table.TableArn, @@ -129,7 +129,7 @@ func fetchDynamodbTableReplicaAutoScalings(ctx context.Context, meta schema.Clie } cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb output, err := svc.DescribeTableReplicaAutoScaling(ctx, &dynamodb.DescribeTableReplicaAutoScalingInput{ TableName: par.TableName, @@ -152,7 +152,7 @@ func fetchDynamodbTableContinuousBackups(ctx context.Context, meta schema.Client par := parent.Item.(*types.TableDescription) cl := meta.(*client.Client) - svc := cl.Services().Dynamodb + svc := cl.Services(client.AWSServiceDynamodb).Dynamodb output, err := svc.DescribeContinuousBackups(ctx, &dynamodb.DescribeContinuousBackupsInput{ TableName: par.TableName, diff --git a/plugins/source/aws/resources/services/dynamodbstreams/streams.go b/plugins/source/aws/resources/services/dynamodbstreams/streams.go index 6f3a98f3209b58..9c98965b2e34b0 100644 --- a/plugins/source/aws/resources/services/dynamodbstreams/streams.go +++ b/plugins/source/aws/resources/services/dynamodbstreams/streams.go @@ -36,7 +36,7 @@ func Streams() *schema.Table { func listStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodbstreams + svc := cl.Services(client.AWSServiceDynamodbstreams).Dynamodbstreams config := dynamodbstreams.ListStreamsInput{} // No paginator available @@ -60,7 +60,7 @@ func listStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Res func describeStream(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Dynamodbstreams + svc := cl.Services(client.AWSServiceDynamodbstreams).Dynamodbstreams stream := resource.Item.(types.Stream) response, err := svc.DescribeStream(ctx, &dynamodbstreams.DescribeStreamInput{StreamArn: stream.StreamArn}, func(options *dynamodbstreams.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ec2/account_attributes.go b/plugins/source/aws/resources/services/ec2/account_attributes.go index 29dd8f6c01c44c..79614f53e2df09 100644 --- a/plugins/source/aws/resources/services/ec2/account_attributes.go +++ b/plugins/source/aws/resources/services/ec2/account_attributes.go @@ -31,7 +31,7 @@ func AccountAttributes() *schema.Table { } func fetchAccountAttributes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeAccountAttributes(ctx, &ec2.DescribeAccountAttributesInput{}, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/azs.go b/plugins/source/aws/resources/services/ec2/azs.go index c3023dc82a848c..b255644105a357 100644 --- a/plugins/source/aws/resources/services/ec2/azs.go +++ b/plugins/source/aws/resources/services/ec2/azs.go @@ -43,7 +43,7 @@ func AvailabilityZones() *schema.Table { func fetchAvailabilityZones(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeAvailabilityZones(ctx, &ec2.DescribeAvailabilityZonesInput{AllAvailabilityZones: aws.Bool(true)}, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go index 7c4c85d38d5e71..1677c629287c58 100644 --- a/plugins/source/aws/resources/services/ec2/byoip_cidrs.go +++ b/plugins/source/aws/resources/services/ec2/byoip_cidrs.go @@ -41,7 +41,7 @@ func fetchEc2ByoipCidrs(ctx context.Context, meta schema.ClientMeta, parent *sch }[cl.Region]; ok { return nil } - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 config := ec2.DescribeByoipCidrsInput{ MaxResults: aws.Int32(100), } diff --git a/plugins/source/aws/resources/services/ec2/capacity_reservations.go b/plugins/source/aws/resources/services/ec2/capacity_reservations.go index d5bfb4a74a8613..1e56ad0c1942bd 100644 --- a/plugins/source/aws/resources/services/ec2/capacity_reservations.go +++ b/plugins/source/aws/resources/services/ec2/capacity_reservations.go @@ -41,7 +41,7 @@ func CapacityReservations() *schema.Table { func fetchEc2CapacityReservations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeCapacityReservationsPaginator(svc, &ec2.DescribeCapacityReservationsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/customer_gateways.go b/plugins/source/aws/resources/services/ec2/customer_gateways.go index 458eea1a812074..4502cba158948d 100644 --- a/plugins/source/aws/resources/services/ec2/customer_gateways.go +++ b/plugins/source/aws/resources/services/ec2/customer_gateways.go @@ -43,7 +43,7 @@ func CustomerGateways() *schema.Table { func fetchEc2CustomerGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 response, err := svc.DescribeCustomerGateways(ctx, nil, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/dhcp_options.go b/plugins/source/aws/resources/services/ec2/dhcp_options.go index e3ae43f4b911e9..ac3a1bd380c267 100644 --- a/plugins/source/aws/resources/services/ec2/dhcp_options.go +++ b/plugins/source/aws/resources/services/ec2/dhcp_options.go @@ -34,7 +34,7 @@ func DHCPOptions() *schema.Table { func fetchEC2DHCPOptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 pag := ec2.NewDescribeDhcpOptionsPaginator(svc, &ec2.DescribeDhcpOptionsInput{}) for pag.HasMorePages() { page, err := pag.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go b/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go index 777a582c3b6761..e2e1037fdbe643 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go +++ b/plugins/source/aws/resources/services/ec2/ebs_snapshot_attributes.go @@ -38,7 +38,7 @@ func fetchEbsSnapshotAttributes(ctx context.Context, meta schema.ClientMeta, par if aws.ToString(r.OwnerId) != cl.AccountID { return nil } - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 permissions, err := svc.DescribeSnapshotAttribute(ctx, &ec2.DescribeSnapshotAttributeInput{ Attribute: types.SnapshotAttributeNameCreateVolumePermission, SnapshotId: r.SnapshotId, diff --git a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go index 36281483113eed..42cb0aa5449a7a 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_snapshots.go +++ b/plugins/source/aws/resources/services/ec2/ebs_snapshots.go @@ -46,7 +46,7 @@ func EbsSnapshots() *schema.Table { func fetchEc2EbsSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeSnapshotsPaginator(svc, &ec2.DescribeSnapshotsInput{ OwnerIds: []string{cl.AccountID}, MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go b/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go index 1d0c7503111292..0791c8558c3f4c 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go +++ b/plugins/source/aws/resources/services/ec2/ebs_volume_statuses.go @@ -35,7 +35,7 @@ func EbsVolumesStatuses() *schema.Table { func fetchEc2EbsVolumeStatuses(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 config := ec2.DescribeVolumeStatusInput{MaxResults: aws.Int32(1000)} paginator := ec2.NewDescribeVolumeStatusPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ec2/ebs_volumes.go b/plugins/source/aws/resources/services/ec2/ebs_volumes.go index 11540f2d740809..21f48f52dce240 100644 --- a/plugins/source/aws/resources/services/ec2/ebs_volumes.go +++ b/plugins/source/aws/resources/services/ec2/ebs_volumes.go @@ -43,7 +43,7 @@ func EbsVolumes() *schema.Table { func fetchEc2EbsVolumes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 config := ec2.DescribeVolumesInput{} paginator := ec2.NewDescribeVolumesPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go b/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go index d2d38583c7ee8b..0fac15a2b86e76 100644 --- a/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go +++ b/plugins/source/aws/resources/services/ec2/egress_only_internet_gateways.go @@ -43,7 +43,7 @@ func EgressOnlyInternetGateways() *schema.Table { func fetchEc2EgressOnlyInternetGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 input := ec2.DescribeEgressOnlyInternetGatewaysInput{} paginator := ec2.NewDescribeEgressOnlyInternetGatewaysPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ec2/eips.go b/plugins/source/aws/resources/services/ec2/eips.go index c02e48c167337d..49efe81618cd08 100644 --- a/plugins/source/aws/resources/services/ec2/eips.go +++ b/plugins/source/aws/resources/services/ec2/eips.go @@ -35,7 +35,7 @@ func Eips() *schema.Table { func fetchEc2Eips(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeAddresses(ctx, &ec2.DescribeAddressesInput{ Filters: []types.Filter{{Name: aws.String("domain"), Values: []string{"vpc"}}}, }, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/flow_logs.go b/plugins/source/aws/resources/services/ec2/flow_logs.go index 0a6d065c8e3d81..323e370b66cbf7 100644 --- a/plugins/source/aws/resources/services/ec2/flow_logs.go +++ b/plugins/source/aws/resources/services/ec2/flow_logs.go @@ -44,7 +44,7 @@ func FlowLogs() *schema.Table { func fetchEc2FlowLogs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeFlowLogsInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeFlowLogsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/hosts.go b/plugins/source/aws/resources/services/ec2/hosts.go index d3a007fbdffa7a..61324a313eabd9 100644 --- a/plugins/source/aws/resources/services/ec2/hosts.go +++ b/plugins/source/aws/resources/services/ec2/hosts.go @@ -43,7 +43,7 @@ func Hosts() *schema.Table { func fetchEc2Hosts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 input := ec2.DescribeHostsInput{} paginator := ec2.NewDescribeHostsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ec2/image_attributes.go b/plugins/source/aws/resources/services/ec2/image_attributes.go index 2b1dcbf33dd2ed..d6bf2324ccba87 100644 --- a/plugins/source/aws/resources/services/ec2/image_attributes.go +++ b/plugins/source/aws/resources/services/ec2/image_attributes.go @@ -34,7 +34,7 @@ func fetchEc2ImageAttributeLaunchPermissions(ctx context.Context, meta schema.Cl if aws.ToString(p.OwnerId) != cl.AccountID { return nil } - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeImageAttribute(ctx, &ec2.DescribeImageAttributeInput{ Attribute: types.ImageAttributeNameLaunchPermission, ImageId: p.ImageId, diff --git a/plugins/source/aws/resources/services/ec2/image_last_launched.go b/plugins/source/aws/resources/services/ec2/image_last_launched.go index 7667b34cbd051c..6c91d2ec2de319 100644 --- a/plugins/source/aws/resources/services/ec2/image_last_launched.go +++ b/plugins/source/aws/resources/services/ec2/image_last_launched.go @@ -39,7 +39,7 @@ func fetchEc2ImageAttributeLastLaunchTime(ctx context.Context, meta schema.Clien if aws.ToString(p.OwnerId) != cl.AccountID { return nil } - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeImageAttribute(ctx, &ec2.DescribeImageAttributeInput{ Attribute: types.ImageAttributeNameLastLaunchedTime, ImageId: p.ImageId, diff --git a/plugins/source/aws/resources/services/ec2/images.go b/plugins/source/aws/resources/services/ec2/images.go index d4d4fae0ea327c..0ef39280fa545c 100644 --- a/plugins/source/aws/resources/services/ec2/images.go +++ b/plugins/source/aws/resources/services/ec2/images.go @@ -49,7 +49,7 @@ func Images() *schema.Table { func fetchEc2Images(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 g, ctx := errgroup.WithContext(ctx) g.Go(func() error { // fetch ec2.Images owned by this account diff --git a/plugins/source/aws/resources/services/ec2/instance_connect.go b/plugins/source/aws/resources/services/ec2/instance_connect.go index 18605469db83a7..46a81a776bd986 100644 --- a/plugins/source/aws/resources/services/ec2/instance_connect.go +++ b/plugins/source/aws/resources/services/ec2/instance_connect.go @@ -51,7 +51,7 @@ The 'request_account_id' and 'request_region' columns are added to show from whe func fetchInstanceConnectEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeInstanceConnectEndpointsPaginator(svc, &ec2.DescribeInstanceConnectEndpointsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/instance_statuses.go b/plugins/source/aws/resources/services/ec2/instance_statuses.go index c87f57835a2084..b7d1ef4064af67 100644 --- a/plugins/source/aws/resources/services/ec2/instance_statuses.go +++ b/plugins/source/aws/resources/services/ec2/instance_statuses.go @@ -37,7 +37,7 @@ func InstanceStatuses() *schema.Table { func fetchEc2InstanceStatuses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeInstanceStatusInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeInstanceStatusPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/instance_types.go b/plugins/source/aws/resources/services/ec2/instance_types.go index c127da9e695ee2..22b9edf5baccfb 100644 --- a/plugins/source/aws/resources/services/ec2/instance_types.go +++ b/plugins/source/aws/resources/services/ec2/instance_types.go @@ -36,7 +36,7 @@ func InstanceTypes() *schema.Table { func fetchEc2InstanceTypes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeInstanceTypesPaginator(svc, &ec2.DescribeInstanceTypesInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/instances.go b/plugins/source/aws/resources/services/ec2/instances.go index 2ce8c8e5ef3b44..87503303bb5540 100644 --- a/plugins/source/aws/resources/services/ec2/instances.go +++ b/plugins/source/aws/resources/services/ec2/instances.go @@ -52,7 +52,7 @@ var stateTransitionReasonTimeRegex = regexp.MustCompile(`\((.*)\)`) func fetchEc2Instances(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 p := ec2.NewDescribeInstancesPaginator(svc, &ec2.DescribeInstancesInput{MaxResults: aws.Int32(1000)}) diff --git a/plugins/source/aws/resources/services/ec2/internet_gateways.go b/plugins/source/aws/resources/services/ec2/internet_gateways.go index dedb26e4100ef0..3f3bde141c3e72 100644 --- a/plugins/source/aws/resources/services/ec2/internet_gateways.go +++ b/plugins/source/aws/resources/services/ec2/internet_gateways.go @@ -43,7 +43,7 @@ func InternetGateways() *schema.Table { func fetchEc2InternetGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeInternetGatewaysPaginator(svc, &ec2.DescribeInternetGatewaysInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/key_pairs.go b/plugins/source/aws/resources/services/ec2/key_pairs.go index b4411039ae1bc7..7206b2473c0359 100644 --- a/plugins/source/aws/resources/services/ec2/key_pairs.go +++ b/plugins/source/aws/resources/services/ec2/key_pairs.go @@ -44,7 +44,7 @@ func KeyPairs() *schema.Table { func fetchEc2KeyPairs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeKeyPairsInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeKeyPairs(ctx, &config, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/launch_template_versions.go b/plugins/source/aws/resources/services/ec2/launch_template_versions.go index 8dea0166c14d50..251b24ac11c2ba 100644 --- a/plugins/source/aws/resources/services/ec2/launch_template_versions.go +++ b/plugins/source/aws/resources/services/ec2/launch_template_versions.go @@ -42,7 +42,7 @@ func fetchEc2LaunchTemplateVersions(ctx context.Context, meta schema.ClientMeta, LaunchTemplateId: parent.Item.(types.LaunchTemplate).LaunchTemplateId, } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeLaunchTemplateVersionsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/launch_templates.go b/plugins/source/aws/resources/services/ec2/launch_templates.go index e236b943241206..b5f09e511bcf66 100644 --- a/plugins/source/aws/resources/services/ec2/launch_templates.go +++ b/plugins/source/aws/resources/services/ec2/launch_templates.go @@ -48,7 +48,7 @@ func LaunchTemplates() *schema.Table { func fetchEc2LaunchTemplates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeLaunchTemplatesInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeLaunchTemplatesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go b/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go index 017009856995e1..2d80c9a47c68b8 100644 --- a/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go +++ b/plugins/source/aws/resources/services/ec2/managed_prefix_lists.go @@ -51,7 +51,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco } func fetchEc2ManagedPrefixLists(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeManagedPrefixListsPaginator(svc, &ec2.DescribeManagedPrefixListsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/nat_gateways.go b/plugins/source/aws/resources/services/ec2/nat_gateways.go index 97b10bde96f78d..b950c5aa28b1d2 100644 --- a/plugins/source/aws/resources/services/ec2/nat_gateways.go +++ b/plugins/source/aws/resources/services/ec2/nat_gateways.go @@ -43,7 +43,7 @@ func NatGateways() *schema.Table { func fetchEc2NatGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeNatGatewaysPaginator(svc, &ec2.DescribeNatGatewaysInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/network_acls.go b/plugins/source/aws/resources/services/ec2/network_acls.go index c107dcc6d48d87..620b99ad068266 100644 --- a/plugins/source/aws/resources/services/ec2/network_acls.go +++ b/plugins/source/aws/resources/services/ec2/network_acls.go @@ -43,7 +43,7 @@ func NetworkAcls() *schema.Table { func fetchEc2NetworkAcls(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeNetworkAclsPaginator(svc, &ec2.DescribeNetworkAclsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/network_interfaces.go b/plugins/source/aws/resources/services/ec2/network_interfaces.go index 4c328eb761542b..a7eccaeb663041 100644 --- a/plugins/source/aws/resources/services/ec2/network_interfaces.go +++ b/plugins/source/aws/resources/services/ec2/network_interfaces.go @@ -43,7 +43,7 @@ func NetworkInterfaces() *schema.Table { func fetchEc2NetworkInterfaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeNetworkInterfacesPaginator(svc, &ec2.DescribeNetworkInterfacesInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/regional_configs.go b/plugins/source/aws/resources/services/ec2/regional_configs.go index 67ceb0d7ae7695..b69b9ed1868358 100644 --- a/plugins/source/aws/resources/services/ec2/regional_configs.go +++ b/plugins/source/aws/resources/services/ec2/regional_configs.go @@ -29,7 +29,7 @@ https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetEbsEncryptionByDef func fetchEc2RegionalConfigs(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 var regionalConfig models.RegionalConfig resp, err := svc.GetEbsDefaultKmsKeyId(ctx, &ec2.GetEbsDefaultKmsKeyIdInput{}, func(options *ec2.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ec2/regions.go b/plugins/source/aws/resources/services/ec2/regions.go index cd70c08c20f08b..7396d81b01276e 100644 --- a/plugins/source/aws/resources/services/ec2/regions.go +++ b/plugins/source/aws/resources/services/ec2/regions.go @@ -44,7 +44,7 @@ func Regions() *schema.Table { func fetchEc2Regions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeRegions(ctx, &ec2.DescribeRegionsInput{AllRegions: aws.Bool(true)}, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/reserved_instances.go b/plugins/source/aws/resources/services/ec2/reserved_instances.go index 553c277daa3f7d..bf91451c308180 100644 --- a/plugins/source/aws/resources/services/ec2/reserved_instances.go +++ b/plugins/source/aws/resources/services/ec2/reserved_instances.go @@ -44,7 +44,7 @@ func ReservedInstances() *schema.Table { func fetchEc2ReservedInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeReservedInstancesInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 // this API does not seem to support any form of pagination output, err := svc.DescribeReservedInstances(ctx, &config, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/route_tables.go b/plugins/source/aws/resources/services/ec2/route_tables.go index ca3532b4553e6a..baf1a8c3080789 100644 --- a/plugins/source/aws/resources/services/ec2/route_tables.go +++ b/plugins/source/aws/resources/services/ec2/route_tables.go @@ -43,7 +43,7 @@ func RouteTables() *schema.Table { func fetchEc2RouteTables(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeRouteTablesPaginator(svc, &ec2.DescribeRouteTablesInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/security_groups.go b/plugins/source/aws/resources/services/ec2/security_groups.go index 63314e3a9175dc..4456bc1d945d2c 100644 --- a/plugins/source/aws/resources/services/ec2/security_groups.go +++ b/plugins/source/aws/resources/services/ec2/security_groups.go @@ -44,7 +44,7 @@ func SecurityGroups() *schema.Table { func fetchEc2SecurityGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeSecurityGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeSecurityGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go b/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go index f035e3d3cad40d..d0c7d435067680 100644 --- a/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go +++ b/plugins/source/aws/resources/services/ec2/spot_fleet_instances.go @@ -45,7 +45,7 @@ func fetchEC2SpotFleetInstances(ctx context.Context, meta schema.ClientMeta, par SpotFleetRequestId: p.SpotFleetRequestId, } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 // No paginator available for { output, err := svc.DescribeSpotFleetInstances(ctx, &config, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go b/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go index bb0b3b46b9ac05..7d94595269fcb6 100644 --- a/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go +++ b/plugins/source/aws/resources/services/ec2/spot_fleet_requests.go @@ -37,7 +37,7 @@ func SpotFleetRequests() *schema.Table { func fetchEC2SpotFleetRequests(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 pag := ec2.NewDescribeSpotFleetRequestsPaginator(svc, &ec2.DescribeSpotFleetRequestsInput{}) for pag.HasMorePages() { resp, err := pag.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/spot_instance_requests.go b/plugins/source/aws/resources/services/ec2/spot_instance_requests.go index f49b89471fc1fb..7462bfd5348adb 100644 --- a/plugins/source/aws/resources/services/ec2/spot_instance_requests.go +++ b/plugins/source/aws/resources/services/ec2/spot_instance_requests.go @@ -34,7 +34,7 @@ func SpotInstanceRequests() *schema.Table { func fetchEC2SpotInstanceRequests(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 pag := ec2.NewDescribeSpotInstanceRequestsPaginator(svc, &ec2.DescribeSpotInstanceRequestsInput{}) for pag.HasMorePages() { resp, err := pag.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/subnets.go b/plugins/source/aws/resources/services/ec2/subnets.go index f143dc2a04c273..a41c32f381be01 100644 --- a/plugins/source/aws/resources/services/ec2/subnets.go +++ b/plugins/source/aws/resources/services/ec2/subnets.go @@ -52,7 +52,7 @@ The 'request_account_id' and 'request_region' columns are added to show from whe func fetchEc2Subnets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeSubnetsPaginator(svc, &ec2.DescribeSubnetsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go index 04a34dd01a6c0a..5ddace35c82ceb 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_attachments.go @@ -50,7 +50,7 @@ func fetchEc2TransitGatewayAttachments(ctx context.Context, meta schema.ClientMe }, } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewayAttachmentsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go b/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go index 0f954d17473308..203bb669717ed8 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_multicast_domains.go @@ -51,7 +51,7 @@ func fetchEc2TransitGatewayMulticastDomains(ctx context.Context, meta schema.Cli } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewayMulticastDomainsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go index 1901ed1ea2446c..2a30fe028f65a0 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_peering_attachments.go @@ -51,7 +51,7 @@ func fetchEc2TransitGatewayPeeringAttachments(ctx context.Context, meta schema.C } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewayPeeringAttachmentsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go b/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go index 72008b7a0c9022..c21eaeb54ddbad 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_route_tables.go @@ -50,7 +50,7 @@ func fetchEc2TransitGatewayRouteTables(ctx context.Context, meta schema.ClientMe }, } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewayRouteTablesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go b/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go index 9105378fc249d6..75e2392fd1e3c4 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateway_vpc_attachments.go @@ -50,7 +50,7 @@ func fetchEc2TransitGatewayVpcAttachments(ctx context.Context, meta schema.Clien }, } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewayVpcAttachmentsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/transit_gateways.go b/plugins/source/aws/resources/services/ec2/transit_gateways.go index ae618beb8ad4a1..bd39a52e79cd95 100644 --- a/plugins/source/aws/resources/services/ec2/transit_gateways.go +++ b/plugins/source/aws/resources/services/ec2/transit_gateways.go @@ -54,7 +54,7 @@ func TransitGateways() *schema.Table { func fetchEc2TransitGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeTransitGatewaysPaginator(svc, &ec2.DescribeTransitGatewaysInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go index 22ba319096069e..f98682cdae3813 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_configurations.go @@ -43,7 +43,7 @@ func VpcEndpointServiceConfigurations() *schema.Table { func fetchEc2VpcEndpointServiceConfigurations(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeVpcEndpointServiceConfigurationsPaginator(svc, &ec2.DescribeVpcEndpointServiceConfigurationsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go index 177fae1b9d6d87..c3402bb4d220c9 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_service_permissions.go @@ -37,7 +37,7 @@ func fetchEc2VpcEndpointServicePermissions(ctx context.Context, meta schema.Clie return nil } cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeVpcEndpointServicePermissionsPaginator(svc, &ec2.DescribeVpcEndpointServicePermissionsInput{ ServiceId: endpointService.ServiceId, }) diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go b/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go index 4601c46eec4e76..fe05890334eb7b 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoint_services.go @@ -46,7 +46,7 @@ func VpcEndpointServices() *schema.Table { func fetchEc2VpcEndpointServices(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { var config ec2.DescribeVpcEndpointServicesInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 // No paginator available for { output, err := svc.DescribeVpcEndpointServices(ctx, &config, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go index 46ae59e9b1866c..868546bcab05ef 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/ec2/vpc_endpoints.go @@ -42,7 +42,7 @@ func VpcEndpoints() *schema.Table { } func fetchEc2VpcEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeVpcEndpointsPaginator(svc, &ec2.DescribeVpcEndpointsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go b/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go index 30988bda18bac2..09639028a41f02 100644 --- a/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpc_peering_connections.go @@ -43,7 +43,7 @@ func VpcPeeringConnections() *schema.Table { func fetchEc2VpcPeeringConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeVpcPeeringConnectionsPaginator(svc, &ec2.DescribeVpcPeeringConnectionsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpcs.go b/plugins/source/aws/resources/services/ec2/vpcs.go index 3e3dbd7cedc8d7..85d773fc3593d7 100644 --- a/plugins/source/aws/resources/services/ec2/vpcs.go +++ b/plugins/source/aws/resources/services/ec2/vpcs.go @@ -43,7 +43,7 @@ func Vpcs() *schema.Table { func fetchEc2Vpcs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 paginator := ec2.NewDescribeVpcsPaginator(svc, &ec2.DescribeVpcsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ec2.Options) { diff --git a/plugins/source/aws/resources/services/ec2/vpn_connections.go b/plugins/source/aws/resources/services/ec2/vpn_connections.go index 7f5042ca49c54d..37be386baae0c2 100644 --- a/plugins/source/aws/resources/services/ec2/vpn_connections.go +++ b/plugins/source/aws/resources/services/ec2/vpn_connections.go @@ -33,7 +33,7 @@ func VpnConnections() *schema.Table { func fetchVpnConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 resp, err := svc.DescribeVpnConnections(ctx, nil, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ec2/vpn_gateways.go b/plugins/source/aws/resources/services/ec2/vpn_gateways.go index 9587d69626af8d..10f8394f5b3ef1 100644 --- a/plugins/source/aws/resources/services/ec2/vpn_gateways.go +++ b/plugins/source/aws/resources/services/ec2/vpn_gateways.go @@ -44,7 +44,7 @@ func VpnGateways() *schema.Table { func fetchEc2VpnGateways(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ec2.DescribeVpnGatewaysInput cl := meta.(*client.Client) - svc := cl.Services().Ec2 + svc := cl.Services(client.AWSServiceEc2).Ec2 output, err := svc.DescribeVpnGateways(ctx, &config, func(options *ec2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ecr/lifecycle_policy.go b/plugins/source/aws/resources/services/ecr/lifecycle_policy.go index cd11ee0960f2f4..e97fd18cb48015 100644 --- a/plugins/source/aws/resources/services/ecr/lifecycle_policy.go +++ b/plugins/source/aws/resources/services/ecr/lifecycle_policy.go @@ -30,7 +30,7 @@ func lifeCyclePolicy() *schema.Table { } func fetchRepositoryLifecyclePolicy(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr config := ecr.GetLifecyclePolicyInput{ RepositoryName: parent.Item.(types.Repository).RepositoryName, } diff --git a/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go b/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go index 603c09ee89930d..b2c20d7337925d 100644 --- a/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go +++ b/plugins/source/aws/resources/services/ecr/pull_through_cache_rules.go @@ -26,7 +26,7 @@ func PullThroughCacheRules() *schema.Table { } func fetchPullThroughCacheRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr paginator := ecr.NewDescribePullThroughCacheRulesPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ecr.Options) { diff --git a/plugins/source/aws/resources/services/ecr/registries.go b/plugins/source/aws/resources/services/ecr/registries.go index 91d8e739544503..2de21b9ad4c36d 100644 --- a/plugins/source/aws/resources/services/ecr/registries.go +++ b/plugins/source/aws/resources/services/ecr/registries.go @@ -33,7 +33,7 @@ func Registries() *schema.Table { func fetchEcrRegistries(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr output, err := svc.DescribeRegistry(ctx, &ecr.DescribeRegistryInput{}, func(options *ecr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ecr/registry_policies.go b/plugins/source/aws/resources/services/ecr/registry_policies.go index d1e893f0631562..598c73a3af4816 100644 --- a/plugins/source/aws/resources/services/ecr/registry_policies.go +++ b/plugins/source/aws/resources/services/ecr/registry_policies.go @@ -39,7 +39,7 @@ func RegistryPolicies() *schema.Table { } func fetchEcrRegistryPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr output, err := svc.GetRegistryPolicy(ctx, &ecr.GetRegistryPolicyInput{}, func(options *ecr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/ecr/repositories.go b/plugins/source/aws/resources/services/ecr/repositories.go index caa5272dba7e69..dcea53bf105751 100644 --- a/plugins/source/aws/resources/services/ecr/repositories.go +++ b/plugins/source/aws/resources/services/ecr/repositories.go @@ -51,7 +51,7 @@ func Repositories() *schema.Table { } func fetchEcrRepositories(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr paginator := ecr.NewDescribeRepositoriesPaginator(svc, &ecr.DescribeRepositoriesInput{ MaxResults: aws.Int32(1000), }) @@ -70,7 +70,7 @@ func fetchEcrRepositories(ctx context.Context, meta schema.ClientMeta, parent *s func resolveRepositoryTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr output, err := svc.ListTagsForResource(ctx, &ecr.ListTagsForResourceInput{ ResourceArn: resource.Item.(types.Repository).RepositoryArn, }, func(options *ecr.Options) { @@ -84,7 +84,7 @@ func resolveRepositoryTags(ctx context.Context, meta schema.ClientMeta, resource func resolveRepositoryPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr repo := resource.Item.(types.Repository) output, err := svc.GetRepositoryPolicy(ctx, &ecr.GetRepositoryPolicyInput{ RepositoryName: repo.RepositoryName, diff --git a/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go b/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go index 1bcf5b91c1efe3..34bd216d5fa0e4 100644 --- a/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go +++ b/plugins/source/aws/resources/services/ecr/repository_image_scan_findings.go @@ -26,7 +26,7 @@ func repositoryImageScanFindings() *schema.Table { } func fetchEcrRepositoryImageScanFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr image := parent.Item.(types.ImageDetail) repo := parent.Parent.Item.(types.Repository) for _, tag := range image.ImageTags { diff --git a/plugins/source/aws/resources/services/ecr/repository_images.go b/plugins/source/aws/resources/services/ecr/repository_images.go index 15afc7ce21ec39..bc23e378c6e4a6 100644 --- a/plugins/source/aws/resources/services/ecr/repository_images.go +++ b/plugins/source/aws/resources/services/ecr/repository_images.go @@ -37,7 +37,7 @@ func repositoryImages() *schema.Table { } func fetchEcrRepositoryImages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecr + svc := cl.Services(client.AWSServiceEcr).Ecr config := ecr.DescribeImagesInput{ RepositoryName: parent.Item.(types.Repository).RepositoryName, MaxResults: aws.Int32(1000), diff --git a/plugins/source/aws/resources/services/ecrpublic/repositories.go b/plugins/source/aws/resources/services/ecrpublic/repositories.go index 0c68eb1248bfea..353d530db9a08e 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repositories.go +++ b/plugins/source/aws/resources/services/ecrpublic/repositories.go @@ -46,7 +46,7 @@ func Repositories() *schema.Table { func fetchEcrpublicRepositories(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ecrpublic + svc := cl.Services(client.AWSServiceEcrpublic).Ecrpublic paginator := ecrpublic.NewDescribeRepositoriesPaginator(svc, &ecrpublic.DescribeRepositoriesInput{ MaxResults: aws.Int32(1000), }) @@ -67,7 +67,7 @@ func fetchEcrpublicRepositories(ctx context.Context, meta schema.ClientMeta, par func resolveRepositoryTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Ecrpublic + svc := cl.Services(client.AWSServiceEcrpublic).Ecrpublic repo := resource.Item.(types.Repository) input := ecrpublic.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/ecrpublic/repository_images.go b/plugins/source/aws/resources/services/ecrpublic/repository_images.go index ddb677ef48adb4..4fe76a7ecff638 100644 --- a/plugins/source/aws/resources/services/ecrpublic/repository_images.go +++ b/plugins/source/aws/resources/services/ecrpublic/repository_images.go @@ -39,7 +39,7 @@ func fetchEcrpublicRepositoryImages(ctx context.Context, meta schema.ClientMeta, MaxResults: aws.Int32(1000), } cl := meta.(*client.Client) - svc := cl.Services().Ecrpublic + svc := cl.Services(client.AWSServiceEcrpublic).Ecrpublic paginator := ecrpublic.NewDescribeImagesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ecrpublic.Options) { diff --git a/plugins/source/aws/resources/services/ecs/cluster_container_instances.go b/plugins/source/aws/resources/services/ecs/cluster_container_instances.go index b2ee79cb1955a0..92daa378336f11 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_container_instances.go +++ b/plugins/source/aws/resources/services/ecs/cluster_container_instances.go @@ -40,7 +40,7 @@ func clusterContainerInstances() *schema.Table { func fetchEcsClusterContainerInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cluster := parent.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs config := ecs.ListContainerInstancesInput{ Cluster: cluster.ClusterArn, } diff --git a/plugins/source/aws/resources/services/ecs/cluster_services.go b/plugins/source/aws/resources/services/ecs/cluster_services.go index 802238d6f68802..7fdf6ec6040f06 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_services.go +++ b/plugins/source/aws/resources/services/ecs/cluster_services.go @@ -44,7 +44,7 @@ func clusterServices() *schema.Table { func fetchEcsClusterServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cluster := parent.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs config := ecs.ListServicesInput{ Cluster: cluster.ClusterArn, } diff --git a/plugins/source/aws/resources/services/ecs/cluster_task_sets.go b/plugins/source/aws/resources/services/ecs/cluster_task_sets.go index e4e24516b6c6fc..5c069d436ff5fa 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_task_sets.go +++ b/plugins/source/aws/resources/services/ecs/cluster_task_sets.go @@ -42,7 +42,7 @@ func fetchEcsClusterTaskSets(ctx context.Context, meta schema.ClientMeta, resour service := resource.Item.(types.Service) cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs config := ecs.DescribeTaskSetsInput{ Cluster: cluster.ClusterArn, Service: service.ServiceArn, diff --git a/plugins/source/aws/resources/services/ecs/cluster_tasks.go b/plugins/source/aws/resources/services/ecs/cluster_tasks.go index 73f99cb0bf2071..7c8c77059926bb 100644 --- a/plugins/source/aws/resources/services/ecs/cluster_tasks.go +++ b/plugins/source/aws/resources/services/ecs/cluster_tasks.go @@ -49,7 +49,7 @@ func fetchEcsClusterTasks(ctx context.Context, meta schema.ClientMeta, parent *s cluster := parent.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs var allConfigs []tableoptions.CustomListTasksOpts if cl.Spec.TableOptions.ECSTasks != nil && cl.Spec.TableOptions.ECSTasks.ListTasksOpts != nil { allConfigs = cl.Spec.TableOptions.ECSTasks.ListTasksOpts @@ -88,7 +88,7 @@ func fetchEcsClusterTasks(ctx context.Context, meta schema.ClientMeta, parent *s func getEcsTaskProtection(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs task := resource.Item.(types.Task) resp, err := svc.GetTaskProtection(ctx, &ecs.GetTaskProtectionInput{ Cluster: task.ClusterArn, diff --git a/plugins/source/aws/resources/services/ecs/clusters.go b/plugins/source/aws/resources/services/ecs/clusters.go index 274073ea940611..ca234fbddb11a5 100644 --- a/plugins/source/aws/resources/services/ecs/clusters.go +++ b/plugins/source/aws/resources/services/ecs/clusters.go @@ -48,7 +48,7 @@ func Clusters() *schema.Table { func fetchEcsClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ecs.ListClustersInput cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs paginator := ecs.NewListClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ecs.Options) { diff --git a/plugins/source/aws/resources/services/ecs/task_definitions.go b/plugins/source/aws/resources/services/ecs/task_definitions.go index cb0a50a6ed21b5..f61e909f6b583a 100644 --- a/plugins/source/aws/resources/services/ecs/task_definitions.go +++ b/plugins/source/aws/resources/services/ecs/task_definitions.go @@ -46,7 +46,7 @@ func TaskDefinitions() *schema.Table { func fetchEcsTaskDefinitions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config ecs.ListTaskDefinitionsInput cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs paginator := ecs.NewListTaskDefinitionsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ecs.Options) { @@ -62,7 +62,7 @@ func fetchEcsTaskDefinitions(ctx context.Context, meta schema.ClientMeta, parent func getTaskDefinition(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Ecs + svc := cl.Services(client.AWSServiceEcs).Ecs taskArn := resource.Item.(string) describeTaskDefinitionOutput, err := svc.DescribeTaskDefinition(ctx, &ecs.DescribeTaskDefinitionInput{ diff --git a/plugins/source/aws/resources/services/efs/accesspoints.go b/plugins/source/aws/resources/services/efs/accesspoints.go index f4a7e8131cee07..e542551f3d6325 100644 --- a/plugins/source/aws/resources/services/efs/accesspoints.go +++ b/plugins/source/aws/resources/services/efs/accesspoints.go @@ -40,7 +40,7 @@ func AccessPoints() *schema.Table { func fetchAccessPoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Efs + svc := cl.Services(client.AWSServiceEfs).Efs paginator := efs.NewDescribeAccessPointsPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *efs.Options) { diff --git a/plugins/source/aws/resources/services/efs/filesystems.go b/plugins/source/aws/resources/services/efs/filesystems.go index 76782f41452390..e5cfb64f969833 100644 --- a/plugins/source/aws/resources/services/efs/filesystems.go +++ b/plugins/source/aws/resources/services/efs/filesystems.go @@ -47,7 +47,7 @@ func Filesystems() *schema.Table { func fetchEfsFilesystems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config efs.DescribeFileSystemsInput cl := meta.(*client.Client) - svc := cl.Services().Efs + svc := cl.Services(client.AWSServiceEfs).Efs paginator := efs.NewDescribeFileSystemsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *efs.Options) { @@ -67,7 +67,7 @@ func ResolveEfsFilesystemBackupPolicyStatus(ctx context.Context, meta schema.Cli FileSystemId: p.FileSystemId, } cl := meta.(*client.Client) - svc := cl.Services().Efs + svc := cl.Services(client.AWSServiceEfs).Efs response, err := svc.DescribeBackupPolicy(ctx, &config, func(options *efs.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/eks/add_ons.go b/plugins/source/aws/resources/services/eks/add_ons.go index 4826e75f7d9785..cbb18302d578c6 100644 --- a/plugins/source/aws/resources/services/eks/add_ons.go +++ b/plugins/source/aws/resources/services/eks/add_ons.go @@ -41,7 +41,7 @@ func addOns() *schema.Table { func fetchAddOns(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, res chan<- any) error { cluster := resource.Item.(*types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks paginator := eks.NewListAddonsPaginator(svc, &eks.ListAddonsInput{ClusterName: cluster.Name}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *eks.Options) { @@ -57,7 +57,7 @@ func fetchAddOns(ctx context.Context, meta schema.ClientMeta, resource *schema.R func getAddOn(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks name := resource.Item.(string) cluster := resource.Parent.Item.(*types.Cluster) output, err := svc.DescribeAddon( diff --git a/plugins/source/aws/resources/services/eks/clusters.go b/plugins/source/aws/resources/services/eks/clusters.go index 04691b1b916dde..f23bdf448eb2ab 100644 --- a/plugins/source/aws/resources/services/eks/clusters.go +++ b/plugins/source/aws/resources/services/eks/clusters.go @@ -41,7 +41,7 @@ func Clusters() *schema.Table { func fetchEksClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks paginator := eks.NewListClustersPaginator(svc, &eks.ListClustersInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *eks.Options) { @@ -57,7 +57,7 @@ func fetchEksClusters(ctx context.Context, meta schema.ClientMeta, parent *schem func getEksCluster(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks name := resource.Item.(string) output, err := svc.DescribeCluster( ctx, &eks.DescribeClusterInput{Name: &name}, func(options *eks.Options) { diff --git a/plugins/source/aws/resources/services/eks/fargate_profiles.go b/plugins/source/aws/resources/services/eks/fargate_profiles.go index 8f14bb5237b972..7b175ecbd7d3ad 100644 --- a/plugins/source/aws/resources/services/eks/fargate_profiles.go +++ b/plugins/source/aws/resources/services/eks/fargate_profiles.go @@ -35,7 +35,7 @@ func fargateProfiles() *schema.Table { func fetchFargateProfiles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cluster := parent.Item.(*types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks paginator := eks.NewListFargateProfilesPaginator(svc, &eks.ListFargateProfilesInput{ClusterName: cluster.Name}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *eks.Options) { @@ -51,7 +51,7 @@ func fetchFargateProfiles(ctx context.Context, meta schema.ClientMeta, parent *s func getFargateProfile(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks name := resource.Item.(string) cluster := resource.Parent.Item.(*types.Cluster) output, err := svc.DescribeFargateProfile( diff --git a/plugins/source/aws/resources/services/eks/identity_provider_configs.go b/plugins/source/aws/resources/services/eks/identity_provider_configs.go index 47db88bc822a6b..6615818c9fca05 100644 --- a/plugins/source/aws/resources/services/eks/identity_provider_configs.go +++ b/plugins/source/aws/resources/services/eks/identity_provider_configs.go @@ -42,7 +42,7 @@ func identityProviderConfigs() *schema.Table { func fetchIdentityProviderConfigs(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, res chan<- any) error { cluster := resource.Item.(*types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks paginator := eks.NewListIdentityProviderConfigsPaginator(svc, &eks.ListIdentityProviderConfigsInput{ClusterName: cluster.Name}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *eks.Options) { @@ -58,7 +58,7 @@ func fetchIdentityProviderConfigs(ctx context.Context, meta schema.ClientMeta, r func getIdentityProviderConfigs(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks ipc := resource.Item.(types.IdentityProviderConfig) if aws.ToString(ipc.Type) != "oidc" { return nil diff --git a/plugins/source/aws/resources/services/eks/node_groups.go b/plugins/source/aws/resources/services/eks/node_groups.go index 493ddac200d51b..7eace2ec9c61c8 100644 --- a/plugins/source/aws/resources/services/eks/node_groups.go +++ b/plugins/source/aws/resources/services/eks/node_groups.go @@ -35,7 +35,7 @@ func nodeGroups() *schema.Table { func fetchNodeGroups(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, res chan<- any) error { cluster := resource.Item.(*types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks paginator := eks.NewListNodegroupsPaginator(svc, &eks.ListNodegroupsInput{ClusterName: cluster.Name}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *eks.Options) { @@ -51,7 +51,7 @@ func fetchNodeGroups(ctx context.Context, meta schema.ClientMeta, resource *sche func getNodeGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eks + svc := cl.Services(client.AWSServiceEks).Eks name := resource.Item.(string) cluster := resource.Parent.Item.(*types.Cluster) output, err := svc.DescribeNodegroup( diff --git a/plugins/source/aws/resources/services/elasticache/clusters.go b/plugins/source/aws/resources/services/elasticache/clusters.go index 91af2291d98860..dfbe11b708874b 100644 --- a/plugins/source/aws/resources/services/elasticache/clusters.go +++ b/plugins/source/aws/resources/services/elasticache/clusters.go @@ -42,7 +42,7 @@ func Clusters() *schema.Table { func fetchElasticacheClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticache + svc := cl.Services(client.AWSServiceElasticache).Elasticache var input elasticache.DescribeCacheClustersInput input.ShowCacheNodeInfo = aws.Bool(true) @@ -63,7 +63,7 @@ func resolveClusterTags(ctx context.Context, meta schema.ClientMeta, resource *s cluster := resource.Item.(types.CacheCluster) cl := meta.(*client.Client) - svc := cl.Services().Elasticache + svc := cl.Services(client.AWSServiceElasticache).Elasticache response, err := svc.ListTagsForResource(ctx, &elasticache.ListTagsForResourceInput{ ResourceName: cluster.ARN, }, func(options *elasticache.Options) { diff --git a/plugins/source/aws/resources/services/elasticache/engine_versions.go b/plugins/source/aws/resources/services/elasticache/engine_versions.go index cc75dde315ac98..4b7d84ec9e3a1a 100644 --- a/plugins/source/aws/resources/services/elasticache/engine_versions.go +++ b/plugins/source/aws/resources/services/elasticache/engine_versions.go @@ -52,7 +52,7 @@ func EngineVersions() *schema.Table { func fetchElasticacheEngineVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticache + svc := cl.Services(client.AWSServiceElasticache).Elasticache paginator := elasticache.NewDescribeCacheEngineVersionsPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/elasticache/events.go b/plugins/source/aws/resources/services/elasticache/events.go index 459b2a6c56c7cc..9bd58a052d4c5b 100644 --- a/plugins/source/aws/resources/services/elasticache/events.go +++ b/plugins/source/aws/resources/services/elasticache/events.go @@ -35,7 +35,7 @@ func Events() *schema.Table { func fetchElasticacheEvents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input elasticache.DescribeEventsInput cl := meta.(*client.Client) - svc := cl.Services().Elasticache + svc := cl.Services(client.AWSServiceElasticache).Elasticache paginator := elasticache.NewDescribeEventsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/elasticache/global_replication_groups.go b/plugins/source/aws/resources/services/elasticache/global_replication_groups.go index 7e9d7cfcc85d8b..051d02bc98c7e9 100644 --- a/plugins/source/aws/resources/services/elasticache/global_replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/global_replication_groups.go @@ -33,7 +33,7 @@ func GlobalReplicationGroups() *schema.Table { } func fetchElasticacheGlobalReplicationGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { - paginator := elasticache.NewDescribeGlobalReplicationGroupsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeGlobalReplicationGroupsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) cl := meta.(*client.Client) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { diff --git a/plugins/source/aws/resources/services/elasticache/parameter_groups.go b/plugins/source/aws/resources/services/elasticache/parameter_groups.go index 24d8e473e6cfa6..a51c619194cd6d 100644 --- a/plugins/source/aws/resources/services/elasticache/parameter_groups.go +++ b/plugins/source/aws/resources/services/elasticache/parameter_groups.go @@ -35,7 +35,7 @@ func ParameterGroups() *schema.Table { func fetchElasticacheParameterGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) awsProviderClient := meta.(*client.Client) - svc := awsProviderClient.Services().Elasticache + svc := awsProviderClient.Services(client.AWSServiceElasticache).Elasticache var describeCacheParameterGroupsInput elasticache.DescribeCacheParameterGroupsInput paginator := elasticache.NewDescribeCacheParameterGroupsPaginator(svc, &describeCacheParameterGroupsInput) diff --git a/plugins/source/aws/resources/services/elasticache/replication_groups.go b/plugins/source/aws/resources/services/elasticache/replication_groups.go index 0d1f70e2fa8a0d..df47928969103e 100644 --- a/plugins/source/aws/resources/services/elasticache/replication_groups.go +++ b/plugins/source/aws/resources/services/elasticache/replication_groups.go @@ -41,7 +41,7 @@ func ReplicationGroups() *schema.Table { func fetchElasticacheReplicationGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeReplicationGroupsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeReplicationGroupsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region @@ -56,7 +56,7 @@ func fetchElasticacheReplicationGroups(ctx context.Context, meta schema.ClientMe func resolveElasticacheReplicationGroupTags(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticache + svc := cl.Services(client.AWSServiceElasticache).Elasticache tags, err := svc.ListTagsForResource(ctx, &elasticache.ListTagsForResourceInput{ResourceName: r.Item.(types.ReplicationGroup).ARN}, func(options *elasticache.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go index a4e2b9500c4bd3..f96becff5697af 100644 --- a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go +++ b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes.go @@ -34,7 +34,7 @@ func ReservedCacheNodes() *schema.Table { func fetchElasticacheReservedCacheNodes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeReservedCacheNodesPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeReservedCacheNodesPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go index f9a72695a84d0e..62491ba599a5cb 100644 --- a/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go +++ b/plugins/source/aws/resources/services/elasticache/reserved_cache_nodes_offerings.go @@ -36,7 +36,7 @@ func ReservedCacheNodesOfferings() *schema.Table { func fetchElasticacheReservedCacheNodesOfferings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeReservedCacheNodesOfferingsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeReservedCacheNodesOfferingsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/service_updates.go b/plugins/source/aws/resources/services/elasticache/service_updates.go index dfcad43a8d200c..b711572639d15c 100644 --- a/plugins/source/aws/resources/services/elasticache/service_updates.go +++ b/plugins/source/aws/resources/services/elasticache/service_updates.go @@ -36,7 +36,7 @@ func ServiceUpdates() *schema.Table { func fetchElasticacheServiceUpdates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeServiceUpdatesPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeServiceUpdatesPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/snapshots.go b/plugins/source/aws/resources/services/elasticache/snapshots.go index 21feab7d4a06f0..ca862702dfc201 100644 --- a/plugins/source/aws/resources/services/elasticache/snapshots.go +++ b/plugins/source/aws/resources/services/elasticache/snapshots.go @@ -34,7 +34,7 @@ func Snapshots() *schema.Table { func fetchElasticacheSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeSnapshotsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeSnapshotsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/subnet_groups.go b/plugins/source/aws/resources/services/elasticache/subnet_groups.go index 02bf2ad81a4f7d..0f63d81a173d85 100644 --- a/plugins/source/aws/resources/services/elasticache/subnet_groups.go +++ b/plugins/source/aws/resources/services/elasticache/subnet_groups.go @@ -34,7 +34,7 @@ func SubnetGroups() *schema.Table { func fetchElasticacheSubnetGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeCacheSubnetGroupsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeCacheSubnetGroupsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/update_actions.go b/plugins/source/aws/resources/services/elasticache/update_actions.go index 2d6d755aed4338..a3973831008255 100644 --- a/plugins/source/aws/resources/services/elasticache/update_actions.go +++ b/plugins/source/aws/resources/services/elasticache/update_actions.go @@ -29,7 +29,7 @@ func fetchElasticacheUpdateAction(ctx context.Context, meta schema.ClientMeta, p var input elasticache.DescribeUpdateActionsInput cl := meta.(*client.Client) - paginator := elasticache.NewDescribeUpdateActionsPaginator(meta.(*client.Client).Services().Elasticache, &input) + paginator := elasticache.NewDescribeUpdateActionsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, &input) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/user_groups.go b/plugins/source/aws/resources/services/elasticache/user_groups.go index 565710230abbfa..6b8c96bd1fd56a 100644 --- a/plugins/source/aws/resources/services/elasticache/user_groups.go +++ b/plugins/source/aws/resources/services/elasticache/user_groups.go @@ -34,7 +34,7 @@ func UserGroups() *schema.Table { func fetchElasticacheUserGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeUserGroupsPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeUserGroupsPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticache/users.go b/plugins/source/aws/resources/services/elasticache/users.go index 777f6ea25fba32..9384673a33e53a 100644 --- a/plugins/source/aws/resources/services/elasticache/users.go +++ b/plugins/source/aws/resources/services/elasticache/users.go @@ -34,7 +34,7 @@ func Users() *schema.Table { func fetchElasticacheUsers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := elasticache.NewDescribeUsersPaginator(meta.(*client.Client).Services().Elasticache, nil) + paginator := elasticache.NewDescribeUsersPaginator(meta.(*client.Client).Services(client.AWSServiceElasticache).Elasticache, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(options *elasticache.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go index 5aabb5408761af..4e5be3e5b0843b 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/application_versions.go @@ -36,7 +36,7 @@ func ApplicationVersions() *schema.Table { func fetchElasticbeanstalkApplicationVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config elasticbeanstalk.DescribeApplicationVersionsInput cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk // No paginator available for { output, err := svc.DescribeApplicationVersions(ctx, &config, func(options *elasticbeanstalk.Options) { diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go index 0f271310ae3f16..8b6d7eb6b1c03b 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/applications.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/applications.go @@ -47,7 +47,7 @@ func Applications() *schema.Table { func fetchElasticbeanstalkApplications(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config elasticbeanstalk.DescribeApplicationsInput cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk output, err := svc.DescribeApplications(ctx, &config, func(options *elasticbeanstalk.Options) { options.Region = cl.Region }) @@ -61,7 +61,7 @@ func fetchElasticbeanstalkApplications(ctx context.Context, meta schema.ClientMe func resolveElasticbeanstalkApplicationTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { p := resource.Item.(types.ApplicationDescription) cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk tagsOutput, err := svc.ListTagsForResource(ctx, &elasticbeanstalk.ListTagsForResourceInput{ ResourceArn: p.ApplicationArn, }, func(o *elasticbeanstalk.Options) { diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go index 591b74d23a78a1..d0cb54d65d9ce0 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_options.go @@ -37,7 +37,7 @@ func configurationOptions() *schema.Table { func fetchElasticbeanstalkConfigurationOptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(types.EnvironmentDescription) cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk configOptionsIn := elasticbeanstalk.DescribeConfigurationOptionsInput{ ApplicationName: p.ApplicationName, EnvironmentName: p.EnvironmentName, diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go index 2af32f3c962e87..d7cf562c67fea4 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/configuration_settings.go @@ -37,7 +37,7 @@ func configurationSettings() *schema.Table { func fetchElasticbeanstalkConfigurationSettings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(types.EnvironmentDescription) cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk configOptionsIn := elasticbeanstalk.DescribeConfigurationSettingsInput{ ApplicationName: p.ApplicationName, diff --git a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go index 27fabf93033bb9..8b6e742907dc77 100644 --- a/plugins/source/aws/resources/services/elasticbeanstalk/environments.go +++ b/plugins/source/aws/resources/services/elasticbeanstalk/environments.go @@ -58,7 +58,7 @@ func Environments() *schema.Table { func fetchElasticbeanstalkEnvironments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config elasticbeanstalk.DescribeEnvironmentsInput cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk // No paginator available for { response, err := svc.DescribeEnvironments(ctx, &config, func(options *elasticbeanstalk.Options) { @@ -89,7 +89,7 @@ func resolveElasticbeanstalkEnvironmentListeners(ctx context.Context, meta schem func resolveElasticbeanstalkEnvironmentTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { p := resource.Item.(types.EnvironmentDescription) cl := meta.(*client.Client) - svc := cl.Services().Elasticbeanstalk + svc := cl.Services(client.AWSServiceElasticbeanstalk).Elasticbeanstalk tagsOutput, err := svc.ListTagsForResource(ctx, &elasticbeanstalk.ListTagsForResourceInput{ ResourceArn: p.EnvironmentArn, }, func(o *elasticbeanstalk.Options) { diff --git a/plugins/source/aws/resources/services/elasticsearch/domains.go b/plugins/source/aws/resources/services/elasticsearch/domains.go index ee578ebb3ce2b2..fbe7252fd7a8e6 100644 --- a/plugins/source/aws/resources/services/elasticsearch/domains.go +++ b/plugins/source/aws/resources/services/elasticsearch/domains.go @@ -48,7 +48,7 @@ func Domains() *schema.Table { func fetchElasticsearchDomains(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice out, err := svc.ListDomainNames(ctx, nil, func(options *elasticsearchservice.Options) { options.Region = cl.Region }) @@ -63,7 +63,7 @@ func fetchElasticsearchDomains(ctx context.Context, meta schema.ClientMeta, pare func getDomain(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice out, err := svc.DescribeElasticsearchDomain(ctx, &elasticsearchservice.DescribeElasticsearchDomainInput{ @@ -84,7 +84,7 @@ func getDomain(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func resolveDomainTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice tagsOutput, err := svc.ListTags(ctx, &elasticsearchservice.ListTagsInput{ @@ -103,7 +103,7 @@ func resolveDomainTags(ctx context.Context, meta schema.ClientMeta, resource *sc func resolveAuthorizedPrincipals(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice input := &elasticsearchservice.ListVpcEndpointAccessInput{ DomainName: resource.Item.(*types.ElasticsearchDomainStatus).DomainName, diff --git a/plugins/source/aws/resources/services/elasticsearch/packages.go b/plugins/source/aws/resources/services/elasticsearch/packages.go index ce3aed4475eda8..4ea2e1e85db9be 100644 --- a/plugins/source/aws/resources/services/elasticsearch/packages.go +++ b/plugins/source/aws/resources/services/elasticsearch/packages.go @@ -34,7 +34,7 @@ func Packages() *schema.Table { func fetchElasticsearchPackages(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice p := elasticsearchservice.NewDescribePackagesPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/elasticsearch/versions.go b/plugins/source/aws/resources/services/elasticsearch/versions.go index 3f8c254583a637..b1ae9cc042c594 100644 --- a/plugins/source/aws/resources/services/elasticsearch/versions.go +++ b/plugins/source/aws/resources/services/elasticsearch/versions.go @@ -40,7 +40,7 @@ func Versions() *schema.Table { func fetchElasticsearchVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice p := elasticsearchservice.NewListElasticsearchVersionsPaginator(svc, &elasticsearchservice.ListElasticsearchVersionsInput{MaxResults: 100}, @@ -65,7 +65,7 @@ func resolveVersion(ctx context.Context, meta schema.ClientMeta, resource *schem func resolveInstanceTypes(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice var instanceTypes []types.ESPartitionInstanceType p := elasticsearchservice.NewListElasticsearchInstanceTypesPaginator(svc, diff --git a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go index 71116f1554d2ba..7fb317a4d88094 100644 --- a/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go +++ b/plugins/source/aws/resources/services/elasticsearch/vpc_endpoints.go @@ -35,7 +35,7 @@ func VpcEndpoints() *schema.Table { func fetchElasticsearchVpcEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticsearchservice + svc := cl.Services(client.AWSServiceElasticsearchservice).Elasticsearchservice // get the IDs first listInput := new(elasticsearchservice.ListVpcEndpointsInput) var vpcEndpointIDs []string diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go index fedc3e3febecbe..c30c90109d8360 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipeline_jobs.go @@ -33,7 +33,7 @@ func pipelineJobs() *schema.Table { func fetchElastictranscoderPipelineJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elastictranscoder + svc := cl.Services(client.AWSServiceElastictranscoder).Elastictranscoder p := elastictranscoder.NewListJobsByPipelinePaginator( svc, diff --git a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go index efa8c7e667fbb5..9e5751f3ed75b5 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/pipelines.go +++ b/plugins/source/aws/resources/services/elastictranscoder/pipelines.go @@ -38,7 +38,7 @@ func Pipelines() *schema.Table { func fetchElastictranscoderPipelines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elastictranscoder + svc := cl.Services(client.AWSServiceElastictranscoder).Elastictranscoder p := elastictranscoder.NewListPipelinesPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/elastictranscoder/presets.go b/plugins/source/aws/resources/services/elastictranscoder/presets.go index 1ee6b8e0ecaae6..a9dd274c5c9bcd 100644 --- a/plugins/source/aws/resources/services/elastictranscoder/presets.go +++ b/plugins/source/aws/resources/services/elastictranscoder/presets.go @@ -34,7 +34,7 @@ func Presets() *schema.Table { func fetchElastictranscoderPresets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elastictranscoder + svc := cl.Services(client.AWSServiceElastictranscoder).Elastictranscoder p := elastictranscoder.NewListPresetsPaginator(svc, nil) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go b/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go index 26577db4e1d2ad..fa0cd77b6df5ce 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancer_policies.go @@ -46,7 +46,7 @@ func loadBalancerPolicies() *schema.Table { func fetchElbv1LoadBalancerPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(models.ELBv1LoadBalancerWrapper) cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancing + svc := cl.Services(client.AWSServiceElasticloadbalancing).Elasticloadbalancing response, err := svc.DescribeLoadBalancerPolicies(ctx, &elbv1.DescribeLoadBalancerPoliciesInput{LoadBalancerName: r.LoadBalancerName}, func(options *elbv1.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/elbv1/load_balancers.go b/plugins/source/aws/resources/services/elbv1/load_balancers.go index 54a6cb7f6f17c1..52f8d61273fcea 100644 --- a/plugins/source/aws/resources/services/elbv1/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv1/load_balancers.go @@ -38,7 +38,7 @@ func LoadBalancers() *schema.Table { func fetchElbv1LoadBalancers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancing + svc := cl.Services(client.AWSServiceElasticloadbalancing).Elasticloadbalancing processLoadBalancers := func(loadBalancers []types.LoadBalancerDescription) error { tagsCfg := &elbv1.DescribeTagsInput{LoadBalancerNames: make([]string, 0, len(loadBalancers))} for _, lb := range loadBalancers { diff --git a/plugins/source/aws/resources/services/elbv2/listener_certificates.go b/plugins/source/aws/resources/services/elbv2/listener_certificates.go index 9f8c2f1625cbf8..a77f9df6a1320e 100644 --- a/plugins/source/aws/resources/services/elbv2/listener_certificates.go +++ b/plugins/source/aws/resources/services/elbv2/listener_certificates.go @@ -33,7 +33,7 @@ func listenerCertificates() *schema.Table { func fetchListenerCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 listener := parent.Item.(types.Listener) config := elbv2.DescribeListenerCertificatesInput{ListenerArn: listener.ListenerArn} // No paginator available diff --git a/plugins/source/aws/resources/services/elbv2/listener_rules.go b/plugins/source/aws/resources/services/elbv2/listener_rules.go index 1c27cdef477a92..f26aca40e8ef2e 100644 --- a/plugins/source/aws/resources/services/elbv2/listener_rules.go +++ b/plugins/source/aws/resources/services/elbv2/listener_rules.go @@ -40,7 +40,7 @@ func listenerRules() *schema.Table { func fetchListenerRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) region := cl.Region - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 listener := parent.Item.(types.Listener) config := elbv2.DescribeRulesInput{ListenerArn: listener.ListenerArn} // no paginator available diff --git a/plugins/source/aws/resources/services/elbv2/listeners.go b/plugins/source/aws/resources/services/elbv2/listeners.go index 01fc1a3484edbd..ecce5a7ed2ec89 100644 --- a/plugins/source/aws/resources/services/elbv2/listeners.go +++ b/plugins/source/aws/resources/services/elbv2/listeners.go @@ -49,7 +49,7 @@ func fetchElbv2Listeners(ctx context.Context, meta schema.ClientMeta, parent *sc LoadBalancerArn: lb.LoadBalancerArn, } cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 paginator := elbv2.NewDescribeListenersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *elbv2.Options) { @@ -69,7 +69,7 @@ func fetchElbv2Listeners(ctx context.Context, meta schema.ClientMeta, parent *sc func resolveElbv2listenerTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { region := meta.(*client.Client).Region cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 listener := resource.Item.(types.Listener) tagsOutput, err := svc.DescribeTags(ctx, &elbv2.DescribeTagsInput{ ResourceArns: []string{ diff --git a/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go b/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go index 24ce257e2e9582..94762360415468 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancer_attributes.go @@ -33,7 +33,7 @@ func loadBalancerAttributes() *schema.Table { func fetchLoadBalancerAttributes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { lb := parent.Item.(types.LoadBalancer) cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 result, err := svc.DescribeLoadBalancerAttributes(ctx, &elbv2.DescribeLoadBalancerAttributesInput{LoadBalancerArn: lb.LoadBalancerArn}, func(options *elbv2.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go b/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go index 6ad70c4d693d17..9bfb6f878c23d4 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancer_web_acls.go @@ -41,7 +41,7 @@ func resolveLoadBalancerWebACL(ctx context.Context, meta schema.ClientMeta, pare return nil } cl := meta.(*client.Client) - wafClient := cl.Services().Wafv2 + wafClient := cl.Services(client.AWSServiceWafv2).Wafv2 input := wafv2.GetWebACLForResourceInput{ResourceArn: p.LoadBalancerArn} response, err := wafClient.GetWebACLForResource(ctx, &input, func(options *wafv2.Options) {}, func(options *wafv2.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/elbv2/load_balancers.go b/plugins/source/aws/resources/services/elbv2/load_balancers.go index 9a033fff96949e..e24422830d5009 100644 --- a/plugins/source/aws/resources/services/elbv2/load_balancers.go +++ b/plugins/source/aws/resources/services/elbv2/load_balancers.go @@ -48,7 +48,7 @@ func LoadBalancers() *schema.Table { func fetchLoadBalancers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config elbv2.DescribeLoadBalancersInput cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 paginator := elbv2.NewDescribeLoadBalancersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *elbv2.Options) { @@ -65,7 +65,7 @@ func fetchLoadBalancers(ctx context.Context, meta schema.ClientMeta, parent *sch func resolveLoadBalancerTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) region := cl.Region - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 loadBalancer := resource.Item.(types.LoadBalancer) tagsOutput, err := svc.DescribeTags(ctx, &elbv2.DescribeTagsInput{ ResourceArns: []string{ diff --git a/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go b/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go index 7680ea6c772b9d..50ef5d9ca95149 100644 --- a/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go +++ b/plugins/source/aws/resources/services/elbv2/target_group_target_health_descriptions.go @@ -32,7 +32,7 @@ func targetGroupTargetHealthDescriptions() *schema.Table { func fetchTargetGroupTargetHealthDescriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 tg := parent.Item.(types.TargetGroup) response, err := svc.DescribeTargetHealth(ctx, &elbv2.DescribeTargetHealthInput{ TargetGroupArn: tg.TargetGroupArn, diff --git a/plugins/source/aws/resources/services/elbv2/target_groups.go b/plugins/source/aws/resources/services/elbv2/target_groups.go index 2f733c21abaafc..60ff6e6a1faf9e 100644 --- a/plugins/source/aws/resources/services/elbv2/target_groups.go +++ b/plugins/source/aws/resources/services/elbv2/target_groups.go @@ -45,7 +45,7 @@ func TargetGroups() *schema.Table { func fetchTargetGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 paginator := elbv2.NewDescribeTargetGroupsPaginator(svc, &elbv2.DescribeTargetGroupsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *elbv2.Options) { @@ -62,7 +62,7 @@ func fetchTargetGroups(ctx context.Context, meta schema.ClientMeta, parent *sche func resolveTargetGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) region := cl.Region - svc := cl.Services().Elasticloadbalancingv2 + svc := cl.Services(client.AWSServiceElasticloadbalancingv2).Elasticloadbalancingv2 targetGroup := resource.Item.(types.TargetGroup) tagsOutput, err := svc.DescribeTags(ctx, &elbv2.DescribeTagsInput{ ResourceArns: []string{ diff --git a/plugins/source/aws/resources/services/emr/block_public_access_configs.go b/plugins/source/aws/resources/services/emr/block_public_access_configs.go index 4592319d650d94..ccdbea13ed1772 100644 --- a/plugins/source/aws/resources/services/emr/block_public_access_configs.go +++ b/plugins/source/aws/resources/services/emr/block_public_access_configs.go @@ -26,7 +26,7 @@ func BlockPublicAccessConfigs() *schema.Table { func fetchEmrBlockPublicAccessConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr out, err := svc.GetBlockPublicAccessConfiguration(ctx, &emr.GetBlockPublicAccessConfigurationInput{}, func(options *emr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go b/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go index 32940a235b42b0..79e1c6463398e0 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go +++ b/plugins/source/aws/resources/services/emr/cluster_instance_fleets.go @@ -41,7 +41,7 @@ func fetchClusterInstanceFleets(ctx context.Context, meta schema.ClientMeta, par ClusterId: cluster.Id, } cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListInstanceFleetsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *emr.Options) { diff --git a/plugins/source/aws/resources/services/emr/cluster_instance_groups.go b/plugins/source/aws/resources/services/emr/cluster_instance_groups.go index 659139184b2226..4aae8f71c59f95 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instance_groups.go +++ b/plugins/source/aws/resources/services/emr/cluster_instance_groups.go @@ -38,7 +38,7 @@ func fetchClusterInstanceGroups(ctx context.Context, meta schema.ClientMeta, par return nil } cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListInstanceGroupsPaginator(svc, &emr.ListInstanceGroupsInput{ ClusterId: cluster.Id, }) diff --git a/plugins/source/aws/resources/services/emr/cluster_instances.go b/plugins/source/aws/resources/services/emr/cluster_instances.go index f0ce00b17ae498..7224a5fe5860a5 100644 --- a/plugins/source/aws/resources/services/emr/cluster_instances.go +++ b/plugins/source/aws/resources/services/emr/cluster_instances.go @@ -44,7 +44,7 @@ func clusterInstances() *schema.Table { func fetchClusterInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) p := parent.Item.(*types.Cluster) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListInstancesPaginator(svc, &emr.ListInstancesInput{ClusterId: p.Id}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *emr.Options) { diff --git a/plugins/source/aws/resources/services/emr/clusters.go b/plugins/source/aws/resources/services/emr/clusters.go index b5f4360e6cdbfd..7a4e3989ec396e 100644 --- a/plugins/source/aws/resources/services/emr/clusters.go +++ b/plugins/source/aws/resources/services/emr/clusters.go @@ -57,7 +57,7 @@ func fetchEmrClusters(ctx context.Context, meta schema.ClientMeta, parent *schem }, } cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *emr.Options) { @@ -73,7 +73,7 @@ func fetchEmrClusters(ctx context.Context, meta schema.ClientMeta, parent *schem func getCluster(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr response, err := svc.DescribeCluster(ctx, &emr.DescribeClusterInput{ClusterId: resource.Item.(types.ClusterSummary).Id}, func(options *emr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/emr/notebook_executions.go b/plugins/source/aws/resources/services/emr/notebook_executions.go index fc15d183c6ef83..52439bac7fd786 100644 --- a/plugins/source/aws/resources/services/emr/notebook_executions.go +++ b/plugins/source/aws/resources/services/emr/notebook_executions.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/apache/arrow/go/v13/arrow" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/aws-sdk-go-v2/service/emr/types" @@ -35,7 +36,7 @@ func notebookExecutions() *schema.Table { func fetchNotebookExecutions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) p := parent.Item.(*types.Cluster) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListNotebookExecutionsPaginator(svc, &emr.ListNotebookExecutionsInput{ExecutionEngineId: p.Id}) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *emr.Options) { @@ -51,7 +52,7 @@ func fetchNotebookExecutions(ctx context.Context, meta schema.ClientMeta, parent func getNotebookExecution(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr response, err := svc.DescribeNotebookExecution(ctx, &emr.DescribeNotebookExecutionInput{NotebookExecutionId: resource.Item.(types.NotebookExecutionSummary).NotebookExecutionId}, func(options *emr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/emr/release_labels.go b/plugins/source/aws/resources/services/emr/release_labels.go index 13bb224a6f44bf..1c639ba97327c6 100644 --- a/plugins/source/aws/resources/services/emr/release_labels.go +++ b/plugins/source/aws/resources/services/emr/release_labels.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/cloudquery/cloudquery/plugins/source/aws/client" @@ -32,7 +33,7 @@ func ReleaseLabels() *schema.Table { func fetchEmrReleaseLabels(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListReleaseLabelsPaginator(svc, &emr.ListReleaseLabelsInput{}) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *emr.Options) { @@ -48,7 +49,7 @@ func fetchEmrReleaseLabels(ctx context.Context, meta schema.ClientMeta, _ *schem func getReleaseLabel(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr releaseLabel := resource.Item.(string) config := &emr.DescribeReleaseLabelInput{ReleaseLabel: &releaseLabel} diff --git a/plugins/source/aws/resources/services/emr/security_configuration.go b/plugins/source/aws/resources/services/emr/security_configuration.go index 8da3af13c462ca..bbeb16fd9b4fb4 100644 --- a/plugins/source/aws/resources/services/emr/security_configuration.go +++ b/plugins/source/aws/resources/services/emr/security_configuration.go @@ -45,7 +45,7 @@ func SecurityConfigurations() *schema.Table { func fetchSecurityConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListSecurityConfigurationsPaginator(svc, &emr.ListSecurityConfigurationsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *emr.Options) { @@ -62,7 +62,7 @@ func fetchSecurityConfigurations(ctx context.Context, meta schema.ClientMeta, pa func resolveConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { cl := meta.(*client.Client) item := resource.Item.(types.SecurityConfigurationSummary) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr response, err := svc.DescribeSecurityConfiguration(ctx, &emr.DescribeSecurityConfigurationInput{Name: item.Name}, func(options *emr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/emr/steps.go b/plugins/source/aws/resources/services/emr/steps.go index 71328bbde66a8d..629331f9c207ec 100644 --- a/plugins/source/aws/resources/services/emr/steps.go +++ b/plugins/source/aws/resources/services/emr/steps.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/apache/arrow/go/v13/arrow" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/aws-sdk-go-v2/service/emr/types" @@ -34,7 +35,7 @@ func steps() *schema.Table { func fetchEmrSteps(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr p := parent.Item.(*types.Cluster) paginator := emr.NewListStepsPaginator(svc, &emr.ListStepsInput{ClusterId: p.Id}) for paginator.HasMorePages() { @@ -51,7 +52,7 @@ func fetchEmrSteps(ctx context.Context, meta schema.ClientMeta, parent *schema.R func getStep(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr p := resource.Parent.Item.(*types.Cluster) stepSummary := resource.Item.(types.StepSummary) response, err := svc.DescribeStep(ctx, &emr.DescribeStepInput{ClusterId: p.Id, StepId: stepSummary.Id}, func(options *emr.Options) { diff --git a/plugins/source/aws/resources/services/emr/studio_session_mapping.go b/plugins/source/aws/resources/services/emr/studio_session_mapping.go index cf4247dc4e8f33..d680eec43ba6f8 100644 --- a/plugins/source/aws/resources/services/emr/studio_session_mapping.go +++ b/plugins/source/aws/resources/services/emr/studio_session_mapping.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/apache/arrow/go/v13/arrow" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/aws-sdk-go-v2/service/emr/types" @@ -35,7 +36,7 @@ func studioSessionMapping() *schema.Table { func fetchEmrStudioSessionMapping(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) p := parent.Item.(*types.Studio) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListStudioSessionMappingsPaginator(svc, &emr.ListStudioSessionMappingsInput{ StudioId: p.StudioId, }) @@ -53,7 +54,7 @@ func fetchEmrStudioSessionMapping(ctx context.Context, meta schema.ClientMeta, p func getSessionMapping(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr sms := resource.Item.(types.SessionMappingSummary) response, err := svc.GetStudioSessionMapping(ctx, &emr.GetStudioSessionMappingInput{ StudioId: sms.StudioId, diff --git a/plugins/source/aws/resources/services/emr/studios.go b/plugins/source/aws/resources/services/emr/studios.go index 5e82c34cb116ca..f856a2462f7157 100644 --- a/plugins/source/aws/resources/services/emr/studios.go +++ b/plugins/source/aws/resources/services/emr/studios.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/apache/arrow/go/v13/arrow" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/aws-sdk-go-v2/service/emr/types" @@ -39,7 +40,7 @@ func Studios() *schema.Table { func fetchEmrStudios(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { config := emr.ListStudiosInput{} cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr paginator := emr.NewListStudiosPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *emr.Options) { @@ -55,7 +56,7 @@ func fetchEmrStudios(ctx context.Context, meta schema.ClientMeta, _ *schema.Reso func getStudio(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr response, err := svc.DescribeStudio(ctx, &emr.DescribeStudioInput{StudioId: resource.Item.(types.StudioSummary).StudioId}, func(options *emr.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/emr/supported_instance_types.go b/plugins/source/aws/resources/services/emr/supported_instance_types.go index bbab62f6285214..1a1a331f527bdc 100644 --- a/plugins/source/aws/resources/services/emr/supported_instance_types.go +++ b/plugins/source/aws/resources/services/emr/supported_instance_types.go @@ -2,6 +2,7 @@ package emr import ( "context" + "github.com/apache/arrow/go/v13/arrow" "github.com/aws/aws-sdk-go-v2/service/emr" "github.com/aws/aws-sdk-go-v2/service/emr/types" @@ -33,7 +34,7 @@ func supportedInstanceTypes() *schema.Table { func fetchEmrSupportedInstanceTypes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Emr + svc := cl.Services(client.AWSServiceEmr).Emr p := parent.Item.(*emr.DescribeReleaseLabelOutput) paginator := emr.NewListSupportedInstanceTypesPaginator(svc, &emr.ListSupportedInstanceTypesInput{ReleaseLabel: p.ReleaseLabel}) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/eventbridge/api_destinations.go b/plugins/source/aws/resources/services/eventbridge/api_destinations.go index c39147231b3686..c3eb6f01bb599d 100644 --- a/plugins/source/aws/resources/services/eventbridge/api_destinations.go +++ b/plugins/source/aws/resources/services/eventbridge/api_destinations.go @@ -36,7 +36,7 @@ func ApiDestinations() *schema.Table { func fetchApiDestinations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListApiDestinationsInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListApiDestinations(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/archives.go b/plugins/source/aws/resources/services/eventbridge/archives.go index a0dd92db077447..f7d6641e214e01 100644 --- a/plugins/source/aws/resources/services/eventbridge/archives.go +++ b/plugins/source/aws/resources/services/eventbridge/archives.go @@ -37,7 +37,7 @@ func Archives() *schema.Table { func fetchArchives(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListArchivesInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListArchives(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/connections.go b/plugins/source/aws/resources/services/eventbridge/connections.go index ec3220473e5177..82fd720daaf721 100644 --- a/plugins/source/aws/resources/services/eventbridge/connections.go +++ b/plugins/source/aws/resources/services/eventbridge/connections.go @@ -36,7 +36,7 @@ func Connections() *schema.Table { func fetchConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListConnectionsInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListConnections(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/endpoints.go b/plugins/source/aws/resources/services/eventbridge/endpoints.go index cfe55bbf1da660..1e64ded2f905f8 100644 --- a/plugins/source/aws/resources/services/eventbridge/endpoints.go +++ b/plugins/source/aws/resources/services/eventbridge/endpoints.go @@ -35,7 +35,7 @@ func Endpoints() *schema.Table { func fetchEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListEndpointsInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListEndpoints(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go b/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go index 5b41ee188c5ca3..659dee0254aa5f 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go +++ b/plugins/source/aws/resources/services/eventbridge/event_bus_rules.go @@ -46,7 +46,7 @@ func fetchEventBusRules(ctx context.Context, meta schema.ClientMeta, parent *sch EventBusName: p.Arn, } cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListRules(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go b/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go index 2871e98c37c27a..a344ef3a9806d5 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go +++ b/plugins/source/aws/resources/services/eventbridge/event_bus_targets.go @@ -46,7 +46,7 @@ func fetchEventBusTargets(ctx context.Context, meta schema.ClientMeta, parent *s Rule: rule.Name, } cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListTargetsByRule(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/event_buses.go b/plugins/source/aws/resources/services/eventbridge/event_buses.go index 6d38b520441377..5bf85eb297dab6 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_buses.go +++ b/plugins/source/aws/resources/services/eventbridge/event_buses.go @@ -46,7 +46,7 @@ func EventBuses() *schema.Table { func fetchEventBuses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListEventBusesInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListEventBuses(ctx, &input, func(options *eventbridge.Options) { @@ -71,7 +71,7 @@ func resolveEventBusTags(ctx context.Context, meta schema.ClientMeta, resource * func resolveTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column, resourceArn string) error { cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge input := eventbridge.ListTagsForResourceInput{ ResourceARN: &resourceArn, } diff --git a/plugins/source/aws/resources/services/eventbridge/event_sources.go b/plugins/source/aws/resources/services/eventbridge/event_sources.go index 957c57497cfa3c..07207f30f6fc6e 100644 --- a/plugins/source/aws/resources/services/eventbridge/event_sources.go +++ b/plugins/source/aws/resources/services/eventbridge/event_sources.go @@ -36,7 +36,7 @@ func EventSources() *schema.Table { func fetchEventSources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListEventSourcesInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListEventSources(ctx, &input, func(options *eventbridge.Options) { diff --git a/plugins/source/aws/resources/services/eventbridge/replays.go b/plugins/source/aws/resources/services/eventbridge/replays.go index a3ebb21cffbbb5..635251bed28e01 100644 --- a/plugins/source/aws/resources/services/eventbridge/replays.go +++ b/plugins/source/aws/resources/services/eventbridge/replays.go @@ -37,7 +37,7 @@ func Replays() *schema.Table { func fetchReplays(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input eventbridge.ListReplaysInput cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge // No paginator available for { response, err := svc.ListReplays(ctx, &input, func(options *eventbridge.Options) { @@ -57,7 +57,7 @@ func fetchReplays(ctx context.Context, meta schema.ClientMeta, parent *schema.Re func getReplay(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Eventbridge + svc := cl.Services(client.AWSServiceEventbridge).Eventbridge replay := resource.Item.(types.Replay) diff --git a/plugins/source/aws/resources/services/firehose/delivery_streams.go b/plugins/source/aws/resources/services/firehose/delivery_streams.go index 40458d5608f5ba..6c62b704dd3d35 100644 --- a/plugins/source/aws/resources/services/firehose/delivery_streams.go +++ b/plugins/source/aws/resources/services/firehose/delivery_streams.go @@ -43,7 +43,7 @@ func DeliveryStreams() *schema.Table { func fetchFirehoseDeliveryStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Firehose + svc := cl.Services(client.AWSServiceFirehose).Firehose input := firehose.ListDeliveryStreamsInput{} for { response, err := svc.ListDeliveryStreams(ctx, &input, func(options *firehose.Options) { @@ -64,7 +64,7 @@ func fetchFirehoseDeliveryStreams(ctx context.Context, meta schema.ClientMeta, p func getDeliveryStream(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) streamName := resource.Item.(string) - svc := cl.Services().Firehose + svc := cl.Services(client.AWSServiceFirehose).Firehose streamSummary, err := svc.DescribeDeliveryStream(ctx, &firehose.DescribeDeliveryStreamInput{ DeliveryStreamName: aws.String(streamName), }, func(options *firehose.Options) { @@ -79,7 +79,7 @@ func getDeliveryStream(ctx context.Context, meta schema.ClientMeta, resource *sc func resolveFirehoseDeliveryStreamTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Firehose + svc := cl.Services(client.AWSServiceFirehose).Firehose summary := resource.Item.(*types.DeliveryStreamDescription) input := firehose.ListTagsForDeliveryStreamInput{ DeliveryStreamName: summary.DeliveryStreamName, diff --git a/plugins/source/aws/resources/services/frauddetector/batch_imports.go b/plugins/source/aws/resources/services/frauddetector/batch_imports.go index 18ff7da827a8b1..71127560c73c40 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_imports.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_imports.go @@ -34,7 +34,7 @@ func BatchImports() *schema.Table { func fetchFrauddetectorBatchImports(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Frauddetector + svc := cl.Services(client.AWSServiceFrauddetector).Frauddetector paginator := frauddetector.NewGetBatchImportJobsPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go index 1c021cf42554fa..b4853bb28977fc 100644 --- a/plugins/source/aws/resources/services/frauddetector/batch_predictions.go +++ b/plugins/source/aws/resources/services/frauddetector/batch_predictions.go @@ -34,7 +34,7 @@ func BatchPredictions() *schema.Table { func fetchFrauddetectorBatchPredictions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Frauddetector + svc := cl.Services(client.AWSServiceFrauddetector).Frauddetector paginator := frauddetector.NewGetBatchPredictionJobsPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/frauddetector/detectors.go b/plugins/source/aws/resources/services/frauddetector/detectors.go index 60b9f264e418ce..d29db446983094 100644 --- a/plugins/source/aws/resources/services/frauddetector/detectors.go +++ b/plugins/source/aws/resources/services/frauddetector/detectors.go @@ -45,7 +45,7 @@ func Detectors() *schema.Table { func fetchFrauddetectorDetectors(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetDetectorsPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetDetectorsPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/entity_types.go b/plugins/source/aws/resources/services/frauddetector/entity_types.go index 6b7a7eb733b9c9..b22e58e65f8966 100644 --- a/plugins/source/aws/resources/services/frauddetector/entity_types.go +++ b/plugins/source/aws/resources/services/frauddetector/entity_types.go @@ -41,7 +41,7 @@ func EntityTypes() *schema.Table { func fetchFrauddetectorEntityTypes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetEntityTypesPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetEntityTypesPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/event_types.go b/plugins/source/aws/resources/services/frauddetector/event_types.go index 8790307192c53d..846c1e735937aa 100644 --- a/plugins/source/aws/resources/services/frauddetector/event_types.go +++ b/plugins/source/aws/resources/services/frauddetector/event_types.go @@ -41,7 +41,7 @@ func EventTypes() *schema.Table { func fetchFrauddetectorEventTypes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetEventTypesPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetEventTypesPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/external_models.go b/plugins/source/aws/resources/services/frauddetector/external_models.go index 749a8081abca8f..1ff47f97186c40 100644 --- a/plugins/source/aws/resources/services/frauddetector/external_models.go +++ b/plugins/source/aws/resources/services/frauddetector/external_models.go @@ -34,7 +34,7 @@ func ExternalModels() *schema.Table { func fetchFrauddetectorExternalModels(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetExternalModelsPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetExternalModelsPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/labels.go b/plugins/source/aws/resources/services/frauddetector/labels.go index 04d1ef36d1ba8d..babff62b32c06a 100644 --- a/plugins/source/aws/resources/services/frauddetector/labels.go +++ b/plugins/source/aws/resources/services/frauddetector/labels.go @@ -42,7 +42,7 @@ func Labels() *schema.Table { func fetchFrauddetectorLabels(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetLabelsPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetLabelsPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/model_versions.go b/plugins/source/aws/resources/services/frauddetector/model_versions.go index aafc122e25b5ef..a7622036294151 100644 --- a/plugins/source/aws/resources/services/frauddetector/model_versions.go +++ b/plugins/source/aws/resources/services/frauddetector/model_versions.go @@ -32,7 +32,7 @@ func modelVersions() *schema.Table { func fetchFrauddetectorModelVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewDescribeModelVersionsPaginator(meta.(*client.Client).Services().Frauddetector, + paginator := frauddetector.NewDescribeModelVersionsPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, &frauddetector.DescribeModelVersionsInput{ModelId: parent.Item.(types.Model).ModelId}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { diff --git a/plugins/source/aws/resources/services/frauddetector/models.go b/plugins/source/aws/resources/services/frauddetector/models.go index e7e3e4315e2447..c2b3ff82cefb3d 100644 --- a/plugins/source/aws/resources/services/frauddetector/models.go +++ b/plugins/source/aws/resources/services/frauddetector/models.go @@ -38,7 +38,7 @@ func Models() *schema.Table { func fetchFrauddetectorModels(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetModelsPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetModelsPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/outcomes.go b/plugins/source/aws/resources/services/frauddetector/outcomes.go index bc0cf338cfed80..6736a3b4ee102c 100644 --- a/plugins/source/aws/resources/services/frauddetector/outcomes.go +++ b/plugins/source/aws/resources/services/frauddetector/outcomes.go @@ -41,7 +41,7 @@ func Outcomes() *schema.Table { func fetchFrauddetectorOutcomes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetOutcomesPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetOutcomesPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/frauddetector/rules.go b/plugins/source/aws/resources/services/frauddetector/rules.go index 6e2af0069d1799..f25967f2a62d2c 100644 --- a/plugins/source/aws/resources/services/frauddetector/rules.go +++ b/plugins/source/aws/resources/services/frauddetector/rules.go @@ -32,7 +32,7 @@ func rules() *schema.Table { func fetchFrauddetectorRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetRulesPaginator(meta.(*client.Client).Services().Frauddetector, + paginator := frauddetector.NewGetRulesPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, &frauddetector.GetRulesInput{DetectorId: parent.Item.(types.Detector).DetectorId}) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { diff --git a/plugins/source/aws/resources/services/frauddetector/tag_fetch.go b/plugins/source/aws/resources/services/frauddetector/tag_fetch.go index 512587595bfa1e..b152df04d5f84b 100644 --- a/plugins/source/aws/resources/services/frauddetector/tag_fetch.go +++ b/plugins/source/aws/resources/services/frauddetector/tag_fetch.go @@ -11,7 +11,7 @@ import ( func resolveResourceTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, column schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Frauddetector + svc := cl.Services(client.AWSServiceFrauddetector).Frauddetector paginator := frauddetector.NewListTagsForResourcePaginator(svc, &frauddetector.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/frauddetector/variables.go b/plugins/source/aws/resources/services/frauddetector/variables.go index c6081a7bf237ac..41e2eabd249cf0 100644 --- a/plugins/source/aws/resources/services/frauddetector/variables.go +++ b/plugins/source/aws/resources/services/frauddetector/variables.go @@ -41,7 +41,7 @@ func Variables() *schema.Table { func fetchFrauddetectorVariables(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := frauddetector.NewGetVariablesPaginator(meta.(*client.Client).Services().Frauddetector, nil) + paginator := frauddetector.NewGetVariablesPaginator(meta.(*client.Client).Services(client.AWSServiceFrauddetector).Frauddetector, nil) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *frauddetector.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/fsx/backups.go b/plugins/source/aws/resources/services/fsx/backups.go index 724cb5f04cd75b..418ef666e19576 100644 --- a/plugins/source/aws/resources/services/fsx/backups.go +++ b/plugins/source/aws/resources/services/fsx/backups.go @@ -41,7 +41,7 @@ func Backups() *schema.Table { func fetchFsxBackups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx paginator := fsx.NewDescribeBackupsPaginator(svc, &fsx.DescribeBackupsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *fsx.Options) { diff --git a/plugins/source/aws/resources/services/fsx/data_repository_associations.go b/plugins/source/aws/resources/services/fsx/data_repository_associations.go index 316bfaae93d4b0..cf25f5f7949911 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_associations.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_associations.go @@ -42,7 +42,7 @@ func DataRepositoryAssociations() *schema.Table { func fetchFsxDataRepositoryAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeDataRepositoryAssociationsInput{MaxResults: aws.Int32(25)} paginator := fsx.NewDescribeDataRepositoryAssociationsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/data_repository_tasks.go b/plugins/source/aws/resources/services/fsx/data_repository_tasks.go index 5f1975e8846f25..29100dbb28f3c1 100644 --- a/plugins/source/aws/resources/services/fsx/data_repository_tasks.go +++ b/plugins/source/aws/resources/services/fsx/data_repository_tasks.go @@ -42,7 +42,7 @@ func DataRepositoryTasks() *schema.Table { func fetchFsxDataRepositoryTasks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeDataRepositoryTasksInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeDataRepositoryTasksPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/file_caches.go b/plugins/source/aws/resources/services/fsx/file_caches.go index 91367e4ce046f7..851a45814e16f4 100644 --- a/plugins/source/aws/resources/services/fsx/file_caches.go +++ b/plugins/source/aws/resources/services/fsx/file_caches.go @@ -42,7 +42,7 @@ func FileCaches() *schema.Table { func fetchFsxFileCaches(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeFileCachesInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeFileCachesPaginator(svc, &input) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchFsxFileCaches(ctx context.Context, meta schema.ClientMeta, parent *sch func resolveFileCacheTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { item := resource.Item.(types.FileCache) cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx var tags []types.Tag paginator := fsx.NewListTagsForResourcePaginator(svc, &fsx.ListTagsForResourceInput{ResourceARN: item.ResourceARN}) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/file_systems.go b/plugins/source/aws/resources/services/fsx/file_systems.go index eb8b00d8e2fc9c..8d2ff62b2538ee 100644 --- a/plugins/source/aws/resources/services/fsx/file_systems.go +++ b/plugins/source/aws/resources/services/fsx/file_systems.go @@ -42,7 +42,7 @@ func FileSystems() *schema.Table { func fetchFsxFileSystems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeFileSystemsInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeFileSystemsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/snapshots.go b/plugins/source/aws/resources/services/fsx/snapshots.go index dc1347de937d06..d7d3fe5efb4da2 100644 --- a/plugins/source/aws/resources/services/fsx/snapshots.go +++ b/plugins/source/aws/resources/services/fsx/snapshots.go @@ -47,7 +47,7 @@ func Snapshots() *schema.Table { func fetchFsxSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeSnapshotsInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeSnapshotsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go b/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go index 11ff88cbbe8ac4..c6c6b26eff99d8 100644 --- a/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go +++ b/plugins/source/aws/resources/services/fsx/storage_virtual_machines.go @@ -42,7 +42,7 @@ func StorageVirtualMachines() *schema.Table { func fetchFsxStorageVirtualMachines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeStorageVirtualMachinesInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeStorageVirtualMachinesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/fsx/volumes.go b/plugins/source/aws/resources/services/fsx/volumes.go index f0512343a85d8a..1b9ad72a189292 100644 --- a/plugins/source/aws/resources/services/fsx/volumes.go +++ b/plugins/source/aws/resources/services/fsx/volumes.go @@ -47,7 +47,7 @@ func Volumes() *schema.Table { func fetchFsxVolumes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Fsx + svc := cl.Services(client.AWSServiceFsx).Fsx input := fsx.DescribeVolumesInput{MaxResults: aws.Int32(1000)} paginator := fsx.NewDescribeVolumesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go b/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go index f520ea43afce9f..cce313d94ed7b2 100644 --- a/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go +++ b/plugins/source/aws/resources/services/glacier/data_retrieval_policies.go @@ -27,7 +27,7 @@ func DataRetrievalPolicies() *schema.Table { func fetchGlacierDataRetrievalPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier response, err := svc.GetDataRetrievalPolicy(ctx, &glacier.GetDataRetrievalPolicyInput{}, func(options *glacier.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/glacier/vault_access_policies.go b/plugins/source/aws/resources/services/glacier/vault_access_policies.go index 6dfd4cc3d6a7c7..d1eeb5ee7e926c 100644 --- a/plugins/source/aws/resources/services/glacier/vault_access_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_access_policies.go @@ -40,7 +40,7 @@ func vaultAccessPolicies() *schema.Table { func fetchGlacierVaultAccessPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier p := parent.Item.(types.DescribeVaultOutput) response, err := svc.GetVaultAccessPolicy(ctx, &glacier.GetVaultAccessPolicyInput{ diff --git a/plugins/source/aws/resources/services/glacier/vault_lock_policies.go b/plugins/source/aws/resources/services/glacier/vault_lock_policies.go index 329f65d78d88df..919d1dd34c3ce8 100644 --- a/plugins/source/aws/resources/services/glacier/vault_lock_policies.go +++ b/plugins/source/aws/resources/services/glacier/vault_lock_policies.go @@ -40,7 +40,7 @@ func vaultLockPolicies() *schema.Table { func fetchGlacierVaultLockPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier p := parent.Item.(types.DescribeVaultOutput) response, err := svc.GetVaultLock(ctx, &glacier.GetVaultLockInput{ diff --git a/plugins/source/aws/resources/services/glacier/vault_notifications.go b/plugins/source/aws/resources/services/glacier/vault_notifications.go index a981040c09cb5f..f0c7a81b15bb90 100644 --- a/plugins/source/aws/resources/services/glacier/vault_notifications.go +++ b/plugins/source/aws/resources/services/glacier/vault_notifications.go @@ -33,7 +33,7 @@ func vaultNotifications() *schema.Table { func fetchGlacierVaultNotifications(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier p := parent.Item.(types.DescribeVaultOutput) response, err := svc.GetVaultNotifications(ctx, &glacier.GetVaultNotificationsInput{ diff --git a/plugins/source/aws/resources/services/glacier/vaults.go b/plugins/source/aws/resources/services/glacier/vaults.go index 4eba76d7dc68ac..dc1ff52122771c 100644 --- a/plugins/source/aws/resources/services/glacier/vaults.go +++ b/plugins/source/aws/resources/services/glacier/vaults.go @@ -47,7 +47,7 @@ func Vaults() *schema.Table { func fetchGlacierVaults(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier paginator := glacier.NewListVaultsPaginator(svc, &glacier.ListVaultsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glacier.Options) { @@ -63,7 +63,7 @@ func fetchGlacierVaults(ctx context.Context, meta schema.ClientMeta, parent *sch func resolveGlacierVaultTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glacier + svc := cl.Services(client.AWSServiceGlacier).Glacier it := resource.Item.(types.DescribeVaultOutput) out, err := svc.ListTagsForVault(ctx, &glacier.ListTagsForVaultInput{ VaultName: it.VaultName, diff --git a/plugins/source/aws/resources/services/glue/classifiers.go b/plugins/source/aws/resources/services/glue/classifiers.go index 92a00d049ff51c..c5b8dc85eca40b 100644 --- a/plugins/source/aws/resources/services/glue/classifiers.go +++ b/plugins/source/aws/resources/services/glue/classifiers.go @@ -34,7 +34,7 @@ func Classifiers() *schema.Table { func fetchGlueClassifiers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetClassifiersPaginator(svc, &glue.GetClassifiersInput{}) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/glue/connections.go b/plugins/source/aws/resources/services/glue/connections.go index 77cbfd77b8d073..de712dc3d563ef 100644 --- a/plugins/source/aws/resources/services/glue/connections.go +++ b/plugins/source/aws/resources/services/glue/connections.go @@ -37,7 +37,7 @@ func Connections() *schema.Table { func fetchGlueConnections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetConnectionsPaginator(svc, &glue.GetConnectionsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/glue/crawlers.go b/plugins/source/aws/resources/services/glue/crawlers.go index b42eb557606505..d9b1e6839205a4 100644 --- a/plugins/source/aws/resources/services/glue/crawlers.go +++ b/plugins/source/aws/resources/services/glue/crawlers.go @@ -44,7 +44,7 @@ func Crawlers() *schema.Table { func fetchGlueCrawlers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetCrawlersPaginator(svc, &glue.GetCrawlersInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -63,7 +63,7 @@ func resolveGlueCrawlerArn(ctx context.Context, meta schema.ClientMeta, resource } func resolveGlueCrawlerTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.GetTagsInput{ ResourceArn: aws.String(crawlerARN(cl, aws.ToString(resource.Item.(types.Crawler).Name))), } diff --git a/plugins/source/aws/resources/services/glue/databases.go b/plugins/source/aws/resources/services/glue/databases.go index e069996ead23cc..46aaf66eacdd3c 100644 --- a/plugins/source/aws/resources/services/glue/databases.go +++ b/plugins/source/aws/resources/services/glue/databases.go @@ -48,7 +48,7 @@ func Databases() *schema.Table { func fetchGlueDatabases(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetDatabasesPaginator(svc, &glue.GetDatabasesInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -67,7 +67,7 @@ func resolveGlueDatabaseArn(ctx context.Context, meta schema.ClientMeta, resourc } func resolveGlueDatabaseTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.GetTagsInput{ ResourceArn: aws.String(databaseARN(cl, aws.ToString(resource.Item.(types.Database).Name))), } @@ -83,7 +83,7 @@ func resolveGlueDatabaseTags(ctx context.Context, meta schema.ClientMeta, resour func fetchGlueDatabaseTables(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.Database) cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.GetTablesInput{ DatabaseName: r.Name, } @@ -101,7 +101,7 @@ func fetchGlueDatabaseTables(ctx context.Context, meta schema.ClientMeta, parent } func fetchGlueDatabaseTableIndexes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue d := parent.Parent.Item.(types.Database) t := parent.Item.(types.Table) input := glue.GetPartitionIndexesInput{DatabaseName: d.Name, CatalogId: d.CatalogId, TableName: t.Name} diff --git a/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go b/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go index b03a42adf196a6..23e32a48240b91 100644 --- a/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go +++ b/plugins/source/aws/resources/services/glue/datacatalog_encryption_settings.go @@ -27,7 +27,7 @@ func DatacatalogEncryptionSettings() *schema.Table { func fetchGlueDatacatalogEncryptionSettings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue result, err := svc.GetDataCatalogEncryptionSettings(ctx, &glue.GetDataCatalogEncryptionSettingsInput{}, func(options *glue.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/glue/dev_endpoints.go b/plugins/source/aws/resources/services/glue/dev_endpoints.go index ecc6470a184d9e..c945ad19f210aa 100644 --- a/plugins/source/aws/resources/services/glue/dev_endpoints.go +++ b/plugins/source/aws/resources/services/glue/dev_endpoints.go @@ -42,7 +42,7 @@ func DevEndpoints() *schema.Table { func fetchGlueDevEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetDevEndpointsPaginator(svc, &glue.GetDevEndpointsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -64,7 +64,7 @@ func resolveGlueDevEndpointArn(ctx context.Context, meta schema.ClientMeta, reso } func resolveGlueDevEndpointTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: aws.String(devEndpointARN(cl, aws.ToString(resource.Item.(types.DevEndpoint).EndpointName))), }, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/glue/job_runs.go b/plugins/source/aws/resources/services/glue/job_runs.go index 8b7be68fd66f09..cbdc018f645001 100644 --- a/plugins/source/aws/resources/services/glue/job_runs.go +++ b/plugins/source/aws/resources/services/glue/job_runs.go @@ -34,7 +34,7 @@ func jobRuns() *schema.Table { func fetchGlueJobRuns(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.GetJobRunsInput{ JobName: parent.Item.(types.Job).Name, } diff --git a/plugins/source/aws/resources/services/glue/jobs.go b/plugins/source/aws/resources/services/glue/jobs.go index 012a36dad9149b..a96a5c9c76bda8 100644 --- a/plugins/source/aws/resources/services/glue/jobs.go +++ b/plugins/source/aws/resources/services/glue/jobs.go @@ -46,7 +46,7 @@ func Jobs() *schema.Table { func fetchGlueJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetJobsPaginator(svc, &glue.GetJobsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -66,7 +66,7 @@ func resolveGlueJobArn(ctx context.Context, meta schema.ClientMeta, resource *sc } func resolveGlueJobTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: aws.String(jobARN(cl, aws.ToString(resource.Item.(types.Job).Name))), }, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go b/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go index e44822d7eed48d..96d752469050f8 100644 --- a/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go +++ b/plugins/source/aws/resources/services/glue/ml_transform_task_runs.go @@ -35,7 +35,7 @@ func mlTransformTaskRuns() *schema.Table { func fetchGlueMlTransformTaskRuns(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetMLTaskRunsPaginator(svc, &glue.GetMLTaskRunsInput{ TransformId: parent.Item.(types.MLTransform).TransformId, }) diff --git a/plugins/source/aws/resources/services/glue/ml_transforms.go b/plugins/source/aws/resources/services/glue/ml_transforms.go index 9c1508a56f1326..7058aeb62dea9e 100644 --- a/plugins/source/aws/resources/services/glue/ml_transforms.go +++ b/plugins/source/aws/resources/services/glue/ml_transforms.go @@ -51,7 +51,7 @@ func MlTransforms() *schema.Table { func fetchGlueMlTransforms(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetMLTransformsPaginator(svc, &glue.GetMLTransformsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -71,7 +71,7 @@ func resolveGlueMlTransformArn(ctx context.Context, meta schema.ClientMeta, reso } func resolveGlueMlTransformTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue r := resource.Item.(types.MLTransform) result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: aws.String(mlTransformARN(cl, &r)), diff --git a/plugins/source/aws/resources/services/glue/registries.go b/plugins/source/aws/resources/services/glue/registries.go index edcd1606e2906e..024c4357b28d92 100644 --- a/plugins/source/aws/resources/services/glue/registries.go +++ b/plugins/source/aws/resources/services/glue/registries.go @@ -46,7 +46,7 @@ func Registries() *schema.Table { func fetchGlueRegistries(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewListRegistriesPaginator(svc, &glue.ListRegistriesInput{ MaxResults: aws.Int32(100), }) @@ -64,7 +64,7 @@ func fetchGlueRegistries(ctx context.Context, meta schema.ClientMeta, parent *sc func resolveGlueRegistryTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue r := resource.Item.(types.RegistryListItem) result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: r.RegistryArn, diff --git a/plugins/source/aws/resources/services/glue/registry_schema_versions.go b/plugins/source/aws/resources/services/glue/registry_schema_versions.go index 3e4bfb938fa3e3..13c5695a811466 100644 --- a/plugins/source/aws/resources/services/glue/registry_schema_versions.go +++ b/plugins/source/aws/resources/services/glue/registry_schema_versions.go @@ -42,7 +42,7 @@ func registrySchemaVersions() *schema.Table { func fetchGlueRegistrySchemaVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) s := parent.Item.(*glue.GetSchemaOutput) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.ListSchemaVersionsInput{ SchemaId: &types.SchemaId{ SchemaArn: s.SchemaArn, @@ -64,7 +64,7 @@ func fetchGlueRegistrySchemaVersions(ctx context.Context, meta schema.ClientMeta func getRegistrySchemaVersion(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue item := resource.Item.(types.SchemaVersionListItem) s, err := svc.GetSchemaVersion(ctx, &glue.GetSchemaVersionInput{ @@ -82,7 +82,7 @@ func getRegistrySchemaVersion(ctx context.Context, meta schema.ClientMeta, resou func resolveGlueRegistrySchemaVersionMetadata(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue s := resource.Item.(*glue.GetSchemaVersionOutput) input := &glue.QuerySchemaVersionMetadataInput{ SchemaVersionId: s.SchemaVersionId, diff --git a/plugins/source/aws/resources/services/glue/registry_schemas.go b/plugins/source/aws/resources/services/glue/registry_schemas.go index 03a4e6fa7581d6..d76581e7950cf2 100644 --- a/plugins/source/aws/resources/services/glue/registry_schemas.go +++ b/plugins/source/aws/resources/services/glue/registry_schemas.go @@ -47,7 +47,7 @@ func registrySchemas() *schema.Table { func fetchGlueRegistrySchemas(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.RegistryListItem) cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.ListSchemasInput{ RegistryId: &types.RegistryId{RegistryArn: r.RegistryArn}, MaxResults: aws.Int32(100), @@ -67,7 +67,7 @@ func fetchGlueRegistrySchemas(ctx context.Context, meta schema.ClientMeta, paren func getRegistrySchema(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue item := resource.Item.(types.SchemaListItem) s, err := svc.GetSchema(ctx, &glue.GetSchemaInput{SchemaId: &types.SchemaId{SchemaArn: item.SchemaArn}}, func(options *glue.Options) { @@ -83,7 +83,7 @@ func getRegistrySchema(ctx context.Context, meta schema.ClientMeta, resource *sc func resolveGlueRegistrySchemaTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue s := resource.Item.(*glue.GetSchemaOutput) result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: s.SchemaArn, diff --git a/plugins/source/aws/resources/services/glue/security_configurations.go b/plugins/source/aws/resources/services/glue/security_configurations.go index 9a02dda2298ecd..3601c7ff02f0cc 100644 --- a/plugins/source/aws/resources/services/glue/security_configurations.go +++ b/plugins/source/aws/resources/services/glue/security_configurations.go @@ -33,7 +33,7 @@ func SecurityConfigurations() *schema.Table { func fetchGlueSecurityConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewGetSecurityConfigurationsPaginator(svc, &glue.GetSecurityConfigurationsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/glue/triggers.go b/plugins/source/aws/resources/services/glue/triggers.go index d7098c361f8840..5abf04ffaae9a2 100644 --- a/plugins/source/aws/resources/services/glue/triggers.go +++ b/plugins/source/aws/resources/services/glue/triggers.go @@ -45,7 +45,7 @@ func Triggers() *schema.Table { func fetchGlueTriggers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue input := glue.ListTriggersInput{MaxResults: aws.Int32(200)} paginator := glue.NewListTriggersPaginator(svc, &input) for paginator.HasMorePages() { @@ -63,7 +63,7 @@ func fetchGlueTriggers(ctx context.Context, meta schema.ClientMeta, parent *sche func getTrigger(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) name := resource.Item.(string) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue dc, err := svc.GetTrigger(ctx, &glue.GetTriggerInput{ Name: &name, }, func(options *glue.Options) { @@ -83,7 +83,7 @@ func resolveGlueTriggerArn(ctx context.Context, meta schema.ClientMeta, resource func resolveGlueTriggerTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: aws.String(triggerARN(cl, aws.ToString(resource.Item.(types.Trigger).Name))), }, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/glue/workflows.go b/plugins/source/aws/resources/services/glue/workflows.go index 4d674d4b4955c7..0e1ea1872c1654 100644 --- a/plugins/source/aws/resources/services/glue/workflows.go +++ b/plugins/source/aws/resources/services/glue/workflows.go @@ -45,7 +45,7 @@ func Workflows() *schema.Table { func fetchGlueWorkflows(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue paginator := glue.NewListWorkflowsPaginator(svc, &glue.ListWorkflowsInput{MaxResults: aws.Int32(25)}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *glue.Options) { @@ -61,7 +61,7 @@ func fetchGlueWorkflows(ctx context.Context, meta schema.ClientMeta, parent *sch func getWorkflow(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue wf := resource.Item.(string) w, err := svc.GetWorkflow(ctx, &glue.GetWorkflowInput{Name: &wf}, func(options *glue.Options) { @@ -82,7 +82,7 @@ func resolveGlueWorkflowArn(ctx context.Context, meta schema.ClientMeta, resourc func resolveGlueWorkflowTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Glue + svc := cl.Services(client.AWSServiceGlue).Glue result, err := svc.GetTags(ctx, &glue.GetTagsInput{ ResourceArn: aws.String(workflowARN(cl, aws.ToString(resource.Item.(*types.Workflow).Name))), }, func(options *glue.Options) { diff --git a/plugins/source/aws/resources/services/guardduty/detector_filters.go b/plugins/source/aws/resources/services/guardduty/detector_filters.go index 2f614f91fe27d3..a6f7140c2517e2 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_filters.go +++ b/plugins/source/aws/resources/services/guardduty/detector_filters.go @@ -34,7 +34,7 @@ func fetchDetectorFilters(ctx context.Context, meta schema.ClientMeta, parent *s detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListFiltersInput{ DetectorId: &detector.Id, } @@ -53,7 +53,7 @@ func fetchDetectorFilters(ctx context.Context, meta schema.ClientMeta, parent *s func getDetectorFilter(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty filterName := resource.Item.(string) detector := resource.Parent.Item.(*models.DetectorWrapper) diff --git a/plugins/source/aws/resources/services/guardduty/detector_findings.go b/plugins/source/aws/resources/services/guardduty/detector_findings.go index f60251ef3d7bd4..35b071cdcf6186 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_findings.go +++ b/plugins/source/aws/resources/services/guardduty/detector_findings.go @@ -38,7 +38,7 @@ func fetchDetectorFindings(ctx context.Context, meta schema.ClientMeta, parent * detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListFindingsInput{ DetectorId: &detector.Id, } diff --git a/plugins/source/aws/resources/services/guardduty/detector_ipsets.go b/plugins/source/aws/resources/services/guardduty/detector_ipsets.go index 60d85601f18b9a..3eef60bf981eeb 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_ipsets.go +++ b/plugins/source/aws/resources/services/guardduty/detector_ipsets.go @@ -34,7 +34,7 @@ func fetchDetectorIPSets(ctx context.Context, meta schema.ClientMeta, parent *sc detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListIPSetsInput{ DetectorId: &detector.Id, } @@ -53,7 +53,7 @@ func fetchDetectorIPSets(ctx context.Context, meta schema.ClientMeta, parent *sc func getDetectorIPSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty id := resource.Item.(string) detector := resource.Parent.Item.(*models.DetectorWrapper) diff --git a/plugins/source/aws/resources/services/guardduty/detector_members.go b/plugins/source/aws/resources/services/guardduty/detector_members.go index b7ca44341d0e55..fa40793cca4b06 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_members.go +++ b/plugins/source/aws/resources/services/guardduty/detector_members.go @@ -37,7 +37,7 @@ func detectorMembers() *schema.Table { func fetchDetectorMembers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListMembersInput{DetectorId: aws.String(detector.Id)} paginator := guardduty.NewListMembersPaginator(svc, config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go b/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go index 89a0150d5d068f..c4e8a8a84c2930 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go +++ b/plugins/source/aws/resources/services/guardduty/detector_publishing_destinations.go @@ -34,7 +34,7 @@ func detectorPublishingDestinations() *schema.Table { func fetchGuarddutyDetectorPublishingDestinations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListPublishingDestinationsInput{DetectorId: aws.String(detector.Id)} paginator := guardduty.NewListPublishingDestinationsPaginator(svc, config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go b/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go index 9c11c4d609d4a0..1ec65c447808a2 100644 --- a/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go +++ b/plugins/source/aws/resources/services/guardduty/detector_threat_intel_sets.go @@ -34,7 +34,7 @@ func detectorThreatIntelSets() *schema.Table { func fetchDetectorThreatIntelSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { detector := parent.Item.(*models.DetectorWrapper) cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListThreatIntelSetsInput{DetectorId: aws.String(detector.Id)} paginator := guardduty.NewListThreatIntelSetsPaginator(svc, config) for paginator.HasMorePages() { @@ -51,7 +51,7 @@ func fetchDetectorThreatIntelSets(ctx context.Context, meta schema.ClientMeta, p func getDetectorThreatIntelSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty id := resource.Item.(string) detector := resource.Parent.Item.(*models.DetectorWrapper) diff --git a/plugins/source/aws/resources/services/guardduty/detectors.go b/plugins/source/aws/resources/services/guardduty/detectors.go index 67d3d95f01f44c..0d4dd06d364baa 100644 --- a/plugins/source/aws/resources/services/guardduty/detectors.go +++ b/plugins/source/aws/resources/services/guardduty/detectors.go @@ -52,7 +52,7 @@ func Detectors() *schema.Table { func fetchGuarddutyDetectors(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty config := &guardduty.ListDetectorsInput{} paginator := guardduty.NewListDetectorsPaginator(svc, config) for paginator.HasMorePages() { @@ -69,7 +69,7 @@ func fetchGuarddutyDetectors(ctx context.Context, meta schema.ClientMeta, parent func getDetector(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Guardduty + svc := cl.Services(client.AWSServiceGuardduty).Guardduty dId := resource.Item.(string) d, err := svc.GetDetector(ctx, &guardduty.GetDetectorInput{DetectorId: &dId}, func(options *guardduty.Options) { diff --git a/plugins/source/aws/resources/services/iam/accounts.go b/plugins/source/aws/resources/services/iam/accounts.go index 735103c64a3501..0442a518cc65b5 100644 --- a/plugins/source/aws/resources/services/iam/accounts.go +++ b/plugins/source/aws/resources/services/iam/accounts.go @@ -27,7 +27,7 @@ func Accounts() *schema.Table { func fetchIamAccounts(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam summary, err := svc.GetAccountSummary(ctx, &iam.GetAccountSummaryInput{}, func(options *iam.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/iam/credential_reports.go b/plugins/source/aws/resources/services/iam/credential_reports.go index f1daa641b5a98a..8c2c5df04fa4a7 100644 --- a/plugins/source/aws/resources/services/iam/credential_reports.go +++ b/plugins/source/aws/resources/services/iam/credential_reports.go @@ -106,7 +106,7 @@ func fetchIamCredentialReports(ctx context.Context, meta schema.ClientMeta, _ *s var apiErr smithy.APIError var reportOutput *iam.GetCredentialReportOutput cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam for { reportOutput, err = svc.GetCredentialReport(ctx, &iam.GetCredentialReportInput{}, func(options *iam.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/iam/group_attached_policies.go b/plugins/source/aws/resources/services/iam/group_attached_policies.go index 079b666a23bc0e..c619d553e03d57 100644 --- a/plugins/source/aws/resources/services/iam/group_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/group_attached_policies.go @@ -33,7 +33,7 @@ func groupAttachedPolicies() *schema.Table { func fetchIamGroupAttachedPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(types.Group) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam config := iam.ListAttachedGroupPoliciesInput{ GroupName: p.GroupName, } diff --git a/plugins/source/aws/resources/services/iam/group_policies.go b/plugins/source/aws/resources/services/iam/group_policies.go index 7fae6b9d2cbdb1..870ab27b48fa87 100644 --- a/plugins/source/aws/resources/services/iam/group_policies.go +++ b/plugins/source/aws/resources/services/iam/group_policies.go @@ -42,7 +42,7 @@ func groupPolicies() *schema.Table { func fetchIamGroupPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam group := parent.Item.(types.Group) config := iam.ListGroupPoliciesInput{ GroupName: group.GroupName, @@ -66,7 +66,7 @@ func fetchIamGroupPolicies(ctx context.Context, meta schema.ClientMeta, parent * func getGroupPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := resource.Item.(string) group := resource.Parent.Item.(types.Group) diff --git a/plugins/source/aws/resources/services/iam/groups.go b/plugins/source/aws/resources/services/iam/groups.go index dba8587de8615c..0806cf53e3d667 100644 --- a/plugins/source/aws/resources/services/iam/groups.go +++ b/plugins/source/aws/resources/services/iam/groups.go @@ -39,7 +39,7 @@ func Groups() *schema.Table { func fetchIamGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config iam.ListGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/instance_profiles.go b/plugins/source/aws/resources/services/iam/instance_profiles.go index f5b4feca42f997..2e4d83e21209e6 100644 --- a/plugins/source/aws/resources/services/iam/instance_profiles.go +++ b/plugins/source/aws/resources/services/iam/instance_profiles.go @@ -41,7 +41,7 @@ func InstanceProfiles() *schema.Table { func fetchIamInstanceProfiles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { config := iam.ListInstanceProfilesInput{} cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := iam.NewListInstanceProfilesPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *iam.Options) { @@ -58,7 +58,7 @@ func fetchIamInstanceProfiles(ctx context.Context, meta schema.ClientMeta, paren func resolveIamInstanceProfileTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.InstanceProfile) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam response, err := svc.ListInstanceProfileTags(ctx, &iam.ListInstanceProfileTagsInput{InstanceProfileName: r.InstanceProfileName}, func(options *iam.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/iam/last_accessed_details.go b/plugins/source/aws/resources/services/iam/last_accessed_details.go index 61cf8a4bf5ca8e..c2af3164738b9d 100644 --- a/plugins/source/aws/resources/services/iam/last_accessed_details.go +++ b/plugins/source/aws/resources/services/iam/last_accessed_details.go @@ -112,7 +112,7 @@ func fetchPolicyLastAccessedDetails(ctx context.Context, meta schema.ClientMeta, func fetchLastAccessedDetails(ctx context.Context, meta schema.ClientMeta, arn *string, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam generateConfig := iam.GenerateServiceLastAccessedDetailsInput{ Arn: arn, Granularity: types.AccessAdvisorUsageGranularityTypeActionLevel, diff --git a/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go b/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go index 1bfb29ad6ff4ef..e2d3a566bf8746 100644 --- a/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go +++ b/plugins/source/aws/resources/services/iam/openid_connect_identity_providers.go @@ -41,7 +41,7 @@ func OpenidConnectIdentityProviders() *schema.Table { func fetchIamOpenidConnectIdentityProviders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam response, err := svc.ListOpenIDConnectProviders(ctx, &iam.ListOpenIDConnectProvidersInput{}, func(options *iam.Options) { options.Region = cl.Region }) @@ -55,7 +55,7 @@ func fetchIamOpenidConnectIdentityProviders(ctx context.Context, meta schema.Cli func getOpenIdConnectIdentityProvider(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := resource.Item.(types.OpenIDConnectProviderListEntry) providerResponse, err := svc.GetOpenIDConnectProvider(ctx, &iam.GetOpenIDConnectProviderInput{OpenIDConnectProviderArn: p.Arn}, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/password_policies.go b/plugins/source/aws/resources/services/iam/password_policies.go index 8247326c12c774..2180be5d17bf95 100644 --- a/plugins/source/aws/resources/services/iam/password_policies.go +++ b/plugins/source/aws/resources/services/iam/password_policies.go @@ -27,7 +27,7 @@ func PasswordPolicies() *schema.Table { func fetchIamPasswordPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config iam.GetAccountPasswordPolicyInput cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam response, err := svc.GetAccountPasswordPolicy(ctx, &config, func(options *iam.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/iam/policies.go b/plugins/source/aws/resources/services/iam/policies.go index 57241576495b5b..df31397f2406f3 100644 --- a/plugins/source/aws/resources/services/iam/policies.go +++ b/plugins/source/aws/resources/services/iam/policies.go @@ -55,7 +55,7 @@ func fetchIamPolicies(ctx context.Context, meta schema.ClientMeta, parent *schem }, } cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewGetAccountAuthorizationDetailsPaginator(svc, &config) for paginator.HasMorePages() { @@ -73,7 +73,7 @@ func fetchIamPolicies(ctx context.Context, meta schema.ClientMeta, parent *schem func resolveIamPolicyTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.ManagedPolicyDetail) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam response, err := svc.ListPolicyTags(ctx, &iam.ListPolicyTagsInput{PolicyArn: r.Arn}, func(options *iam.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/iam/role_attached_policies.go b/plugins/source/aws/resources/services/iam/role_attached_policies.go index 5adaaf0f1c9519..ffab3bd7700ecf 100644 --- a/plugins/source/aws/resources/services/iam/role_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/role_attached_policies.go @@ -33,7 +33,7 @@ func roleAttachedPolicies() *schema.Table { func fetchIamRoleAttachedPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(*types.Role) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam config := iam.ListAttachedRolePoliciesInput{ RoleName: p.RoleName, } diff --git a/plugins/source/aws/resources/services/iam/role_policies.go b/plugins/source/aws/resources/services/iam/role_policies.go index 07f32e2d180263..2c4fbdda0f66e8 100644 --- a/plugins/source/aws/resources/services/iam/role_policies.go +++ b/plugins/source/aws/resources/services/iam/role_policies.go @@ -42,7 +42,7 @@ func rolePolicies() *schema.Table { func fetchIamRolePolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam role := parent.Item.(*types.Role) paginator := iam.NewListRolePoliciesPaginator(svc, &iam.ListRolePoliciesInput{ RoleName: role.RoleName, @@ -64,7 +64,7 @@ func fetchIamRolePolicies(ctx context.Context, meta schema.ClientMeta, parent *s func getRolePolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := resource.Item.(string) role := resource.Parent.Item.(*types.Role) diff --git a/plugins/source/aws/resources/services/iam/roles.go b/plugins/source/aws/resources/services/iam/roles.go index e0129731dec17e..d2591e83a900a6 100644 --- a/plugins/source/aws/resources/services/iam/roles.go +++ b/plugins/source/aws/resources/services/iam/roles.go @@ -47,7 +47,7 @@ func Roles() *schema.Table { func fetchIamRoles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config iam.ListRolesInput cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListRolesPaginator(svc, &config) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *iam.Options) { @@ -64,7 +64,7 @@ func fetchIamRoles(ctx context.Context, meta schema.ClientMeta, parent *schema.R func getRole(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { role := resource.Item.(types.Role) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam roleDetails, err := svc.GetRole(ctx, &iam.GetRoleInput{ RoleName: role.RoleName, }, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/saml_identity_providers.go b/plugins/source/aws/resources/services/iam/saml_identity_providers.go index 2e0f5f95b0922c..a451fb8d5f20eb 100644 --- a/plugins/source/aws/resources/services/iam/saml_identity_providers.go +++ b/plugins/source/aws/resources/services/iam/saml_identity_providers.go @@ -38,7 +38,7 @@ func SamlIdentityProviders() *schema.Table { func fetchIamSamlIdentityProviders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam response, err := svc.ListSAMLProviders(ctx, &iam.ListSAMLProvidersInput{}, func(options *iam.Options) { options.Region = cl.Region }) @@ -52,7 +52,7 @@ func fetchIamSamlIdentityProviders(ctx context.Context, meta schema.ClientMeta, func getSamlIdentityProvider(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := resource.Item.(types.SAMLProviderListEntry) providerResponse, err := svc.GetSAMLProvider(ctx, &iam.GetSAMLProviderInput{SAMLProviderArn: p.Arn}, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/server_certificates.go b/plugins/source/aws/resources/services/iam/server_certificates.go index 60507420676ffa..af90551f5355ec 100644 --- a/plugins/source/aws/resources/services/iam/server_certificates.go +++ b/plugins/source/aws/resources/services/iam/server_certificates.go @@ -34,7 +34,7 @@ func ServerCertificates() *schema.Table { func fetchIamServerCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config iam.ListServerCertificatesInput cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListServerCertificatesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/signing_certificates.go b/plugins/source/aws/resources/services/iam/signing_certificates.go index 65bfe59a7a458f..d08037f22a97ac 100644 --- a/plugins/source/aws/resources/services/iam/signing_certificates.go +++ b/plugins/source/aws/resources/services/iam/signing_certificates.go @@ -38,7 +38,7 @@ func signingCertificates() *schema.Table { func fetchUserSigningCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { config := &iam.ListSigningCertificatesInput{UserName: parent.Item.(*types.User).UserName} cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListSigningCertificatesPaginator(svc, config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/ssh_public_keys.go b/plugins/source/aws/resources/services/iam/ssh_public_keys.go index 1368c91cd46d69..f60446e51bb3f0 100644 --- a/plugins/source/aws/resources/services/iam/ssh_public_keys.go +++ b/plugins/source/aws/resources/services/iam/ssh_public_keys.go @@ -42,7 +42,7 @@ func sshPublicKeys() *schema.Table { } func fetchIamSshPublicKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListSSHPublicKeysPaginator(svc, &iam.ListSSHPublicKeysInput{ UserName: parent.Item.(*types.User).UserName, }) diff --git a/plugins/source/aws/resources/services/iam/user_access_keys.go b/plugins/source/aws/resources/services/iam/user_access_keys.go index 1e28095bd566fe..2131a995772320 100644 --- a/plugins/source/aws/resources/services/iam/user_access_keys.go +++ b/plugins/source/aws/resources/services/iam/user_access_keys.go @@ -55,7 +55,7 @@ func fetchIamUserAccessKeys(ctx context.Context, meta schema.ClientMeta, parent var config iam.ListAccessKeysInput p := parent.Item.(*types.User) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam config.UserName = p.UserName paginator := iam.NewListAccessKeysPaginator(svc, &config) for paginator.HasMorePages() { @@ -87,7 +87,7 @@ func postIamUserAccessKeyResolver(ctx context.Context, meta schema.ClientMeta, r return nil } cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam output, err := svc.GetAccessKeyLastUsed(ctx, &iam.GetAccessKeyLastUsedInput{AccessKeyId: r.AccessKeyId}, func(options *iam.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/iam/user_attached_policies.go b/plugins/source/aws/resources/services/iam/user_attached_policies.go index 64b4e83c8eacae..45276570252e9a 100644 --- a/plugins/source/aws/resources/services/iam/user_attached_policies.go +++ b/plugins/source/aws/resources/services/iam/user_attached_policies.go @@ -44,7 +44,7 @@ func userAttachedPolicies() *schema.Table { func fetchIamUserAttachedPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(*types.User) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam config := iam.ListAttachedUserPoliciesInput{ UserName: p.UserName, } diff --git a/plugins/source/aws/resources/services/iam/user_groups.go b/plugins/source/aws/resources/services/iam/user_groups.go index 86538a48351226..98bb3bdee7c9b5 100644 --- a/plugins/source/aws/resources/services/iam/user_groups.go +++ b/plugins/source/aws/resources/services/iam/user_groups.go @@ -38,7 +38,7 @@ func fetchIamUserGroups(ctx context.Context, meta schema.ClientMeta, parent *sch var config iam.ListGroupsForUserInput p := parent.Item.(*types.User) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam config.UserName = p.UserName paginator := iam.NewListGroupsForUserPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/iam/user_policies.go b/plugins/source/aws/resources/services/iam/user_policies.go index ac08d20183c54d..a4148c84e2a3cc 100644 --- a/plugins/source/aws/resources/services/iam/user_policies.go +++ b/plugins/source/aws/resources/services/iam/user_policies.go @@ -47,7 +47,7 @@ func userPolicies() *schema.Table { func fetchIamUserPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam user := parent.Item.(*types.User) config := iam.ListUserPoliciesInput{UserName: user.UserName} paginator := iam.NewListUserPoliciesPaginator(svc, &config) @@ -68,7 +68,7 @@ func fetchIamUserPolicies(ctx context.Context, meta schema.ClientMeta, parent *s func getUserPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := resource.Item.(string) user := resource.Parent.Item.(*types.User) diff --git a/plugins/source/aws/resources/services/iam/users.go b/plugins/source/aws/resources/services/iam/users.go index 034ce702ebcb57..0908fed65198fc 100644 --- a/plugins/source/aws/resources/services/iam/users.go +++ b/plugins/source/aws/resources/services/iam/users.go @@ -53,7 +53,7 @@ func Users() *schema.Table { func fetchIamUsers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { config := iam.ListUsersInput{} cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam p := iam.NewListUsersPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *iam.Options) { @@ -70,7 +70,7 @@ func fetchIamUsers(ctx context.Context, meta schema.ClientMeta, parent *schema.R func getUser(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { listUser := resource.Item.(types.User) cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam userDetail, err := svc.GetUser(ctx, &iam.GetUserInput{ UserName: aws.String(*listUser.UserName), }, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go b/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go index 8a1e286aa5c562..235d29809c51ce 100644 --- a/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go +++ b/plugins/source/aws/resources/services/iam/virtual_mfa_devices.go @@ -39,7 +39,7 @@ func VirtualMfaDevices() *schema.Table { func fetchIamVirtualMfaDevices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iam + svc := cl.Services(client.AWSServiceIam).Iam paginator := iam.NewListVirtualMFADevicesPaginator(svc, &iam.ListVirtualMFADevicesInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iam.Options) { diff --git a/plugins/source/aws/resources/services/identitystore/group_memberships.go b/plugins/source/aws/resources/services/identitystore/group_memberships.go index 14d9a7950bd532..8346e1f868f311 100644 --- a/plugins/source/aws/resources/services/identitystore/group_memberships.go +++ b/plugins/source/aws/resources/services/identitystore/group_memberships.go @@ -30,7 +30,7 @@ func groupMemberships() *schema.Table { func fetchIdentitystoreGroupMemberships(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Identitystore + svc := cl.Services(client.AWSServiceIdentitystore).Identitystore group := parent.Item.(types.Group) config := identitystore.ListGroupMembershipsInput{ GroupId: group.GroupId, diff --git a/plugins/source/aws/resources/services/identitystore/groups.go b/plugins/source/aws/resources/services/identitystore/groups.go index 65a283c2c50d3a..50cd478188410c 100644 --- a/plugins/source/aws/resources/services/identitystore/groups.go +++ b/plugins/source/aws/resources/services/identitystore/groups.go @@ -31,7 +31,7 @@ func fetchIdentitystoreGroups(ctx context.Context, meta schema.ClientMeta, paren return err } cl := meta.(*client.Client) - svc := cl.Services().Identitystore + svc := cl.Services(client.AWSServiceIdentitystore).Identitystore config := identitystore.ListGroupsInput{ IdentityStoreId: instance.IdentityStoreId, } diff --git a/plugins/source/aws/resources/services/identitystore/instance_fetch.go b/plugins/source/aws/resources/services/identitystore/instance_fetch.go index 0eab9ccfb1de89..faea38533e3725 100644 --- a/plugins/source/aws/resources/services/identitystore/instance_fetch.go +++ b/plugins/source/aws/resources/services/identitystore/instance_fetch.go @@ -11,7 +11,7 @@ import ( func getIamInstance(ctx context.Context, meta schema.ClientMeta) (types.InstanceMetadata, error) { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin config := ssoadmin.ListInstancesInput{} response, err := svc.ListInstances(ctx, &config, func(options *ssoadmin.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/identitystore/users.go b/plugins/source/aws/resources/services/identitystore/users.go index f652e0cc43022f..4aa85875b3c965 100644 --- a/plugins/source/aws/resources/services/identitystore/users.go +++ b/plugins/source/aws/resources/services/identitystore/users.go @@ -27,7 +27,7 @@ func fetchIdentitystoreUsers(ctx context.Context, meta schema.ClientMeta, parent return err } cl := meta.(*client.Client) - svc := cl.Services().Identitystore + svc := cl.Services(client.AWSServiceIdentitystore).Identitystore config := identitystore.ListUsersInput{ IdentityStoreId: instance.IdentityStoreId, } diff --git a/plugins/source/aws/resources/services/inspector/findings.go b/plugins/source/aws/resources/services/inspector/findings.go index 2bc5fab37cbb90..89d80871bf7dd1 100644 --- a/plugins/source/aws/resources/services/inspector/findings.go +++ b/plugins/source/aws/resources/services/inspector/findings.go @@ -46,7 +46,7 @@ func Findings() *schema.Table { func fetchInspectorFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Inspector + svc := cl.Services(client.AWSServiceInspector).Inspector input := inspector.ListFindingsInput{MaxResults: aws.Int32(50)} paginator := inspector.NewListFindingsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/inspector2/findings.go b/plugins/source/aws/resources/services/inspector2/findings.go index 15de069c7c71b4..06d242abbe94a3 100644 --- a/plugins/source/aws/resources/services/inspector2/findings.go +++ b/plugins/source/aws/resources/services/inspector2/findings.go @@ -47,7 +47,7 @@ The 'request_account_id' and 'request_region' columns are added to show from whe func fetchInspector2Findings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Inspector2 + svc := cl.Services(client.AWSServiceInspector2).Inspector2 allConfigs := []tableoptions.CustomInspector2ListFindingsInput{{}} if cl.Spec.TableOptions.Inspector2Findings != nil { diff --git a/plugins/source/aws/resources/services/iot/billing_groups.go b/plugins/source/aws/resources/services/iot/billing_groups.go index e95ed96c44e81d..1d135522fb84eb 100644 --- a/plugins/source/aws/resources/services/iot/billing_groups.go +++ b/plugins/source/aws/resources/services/iot/billing_groups.go @@ -52,7 +52,7 @@ func fetchIotBillingGroups(ctx context.Context, meta schema.ClientMeta, parent * } cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListBillingGroupsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iot.Options) { @@ -68,7 +68,7 @@ func fetchIotBillingGroups(ctx context.Context, meta schema.ClientMeta, parent * func getBillingGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeBillingGroup(ctx, &iot.DescribeBillingGroupInput{ BillingGroupName: resource.Item.(types.GroupNameAndArn).GroupName, @@ -86,7 +86,7 @@ func getBillingGroup(ctx context.Context, meta schema.ClientMeta, resource *sche func resolveIotBillingGroupThingsInGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeBillingGroupOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListThingsInBillingGroupInput{ BillingGroupName: i.BillingGroupName, MaxResults: aws.Int32(250), @@ -107,6 +107,6 @@ func resolveIotBillingGroupThingsInGroup(ctx context.Context, meta schema.Client func resolveIotBillingGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeBillingGroupOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.BillingGroupArn) } diff --git a/plugins/source/aws/resources/services/iot/ca_certificates.go b/plugins/source/aws/resources/services/iot/ca_certificates.go index bda3592f2f1151..eb541dfa9b98a9 100644 --- a/plugins/source/aws/resources/services/iot/ca_certificates.go +++ b/plugins/source/aws/resources/services/iot/ca_certificates.go @@ -45,7 +45,7 @@ func fetchIotCaCertificates(ctx context.Context, meta schema.ClientMeta, parent } cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListCACertificatesPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iot.Options) { @@ -61,7 +61,7 @@ func fetchIotCaCertificates(ctx context.Context, meta schema.ClientMeta, parent func getCaCertificate(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeCACertificate(ctx, &iot.DescribeCACertificateInput{ CertificateId: resource.Item.(types.CACertificate).CertificateId, @@ -78,7 +78,7 @@ func getCaCertificate(ctx context.Context, meta schema.ClientMeta, resource *sch func ResolveIotCaCertificateCertificates(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*types.CACertificateDescription) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListCertificatesByCAInput{ CaCertificateId: i.CertificateId, PageSize: aws.Int32(250), diff --git a/plugins/source/aws/resources/services/iot/certificates.go b/plugins/source/aws/resources/services/iot/certificates.go index a88f8251429d3d..769066f432e0b7 100644 --- a/plugins/source/aws/resources/services/iot/certificates.go +++ b/plugins/source/aws/resources/services/iot/certificates.go @@ -40,7 +40,7 @@ func Certificates() *schema.Table { } func fetchIotCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListCertificatesInput{ PageSize: aws.Int32(250), } @@ -60,7 +60,7 @@ func fetchIotCertificates(ctx context.Context, meta schema.ClientMeta, parent *s func getCertificate(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cert := resource.Item.(types.Certificate) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot certDescription, err := svc.DescribeCertificate(ctx, &iot.DescribeCertificateInput{ CertificateId: cert.CertificateId, }, func(options *iot.Options) { @@ -75,7 +75,7 @@ func getCertificate(ctx context.Context, meta schema.ClientMeta, resource *schem func ResolveIotCertificatePolicies(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListAttachedPoliciesInput{ Target: resource.Item.(*types.CertificateDescription).CertificateArn, PageSize: aws.Int32(250), diff --git a/plugins/source/aws/resources/services/iot/jobs.go b/plugins/source/aws/resources/services/iot/jobs.go index 3ccac34e7d29f1..cf7c03a3ed1c78 100644 --- a/plugins/source/aws/resources/services/iot/jobs.go +++ b/plugins/source/aws/resources/services/iot/jobs.go @@ -43,7 +43,7 @@ func Jobs() *schema.Table { func fetchIotJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListJobsInput{ MaxResults: aws.Int32(250), } @@ -62,7 +62,7 @@ func fetchIotJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Re func getJobs(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeJob(ctx, &iot.DescribeJobInput{ JobId: resource.Item.(types.JobSummary).JobId, @@ -79,6 +79,6 @@ func getJobs(ctx context.Context, meta schema.ClientMeta, resource *schema.Resou func ResolveIotJobTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*types.Job) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.JobArn) } diff --git a/plugins/source/aws/resources/services/iot/policies.go b/plugins/source/aws/resources/services/iot/policies.go index 84dc60ce0b1848..2fe8afa9513e89 100644 --- a/plugins/source/aws/resources/services/iot/policies.go +++ b/plugins/source/aws/resources/services/iot/policies.go @@ -43,7 +43,7 @@ func Policies() *schema.Table { func fetchIotPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListPoliciesInput{ PageSize: aws.Int32(250), } @@ -63,7 +63,7 @@ func fetchIotPolicies(ctx context.Context, meta schema.ClientMeta, parent *schem func getPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.GetPolicy(ctx, &iot.GetPolicyInput{ PolicyName: resource.Item.(types.Policy).PolicyName, @@ -80,6 +80,6 @@ func getPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func ResolveIotPolicyTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.GetPolicyOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.PolicyArn) } diff --git a/plugins/source/aws/resources/services/iot/security_profiles.go b/plugins/source/aws/resources/services/iot/security_profiles.go index dad43dd5eb7907..28c610c4394d99 100644 --- a/plugins/source/aws/resources/services/iot/security_profiles.go +++ b/plugins/source/aws/resources/services/iot/security_profiles.go @@ -48,7 +48,7 @@ func SecurityProfiles() *schema.Table { func fetchIotSecurityProfiles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListSecurityProfilesInput{ MaxResults: aws.Int32(250), } @@ -67,7 +67,7 @@ func fetchIotSecurityProfiles(ctx context.Context, meta schema.ClientMeta, paren func getSecurityProfile(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeSecurityProfile(ctx, &iot.DescribeSecurityProfileInput{ SecurityProfileName: resource.Item.(types.SecurityProfileIdentifier).Name, @@ -84,7 +84,7 @@ func getSecurityProfile(ctx context.Context, meta schema.ClientMeta, resource *s func ResolveIotSecurityProfileTargets(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeSecurityProfileOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListTargetsForSecurityProfileInput{ SecurityProfileName: i.SecurityProfileName, MaxResults: aws.Int32(250), @@ -109,6 +109,6 @@ func ResolveIotSecurityProfileTargets(ctx context.Context, meta schema.ClientMet func ResolveIotSecurityProfileTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeSecurityProfileOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.SecurityProfileArn) } diff --git a/plugins/source/aws/resources/services/iot/streams.go b/plugins/source/aws/resources/services/iot/streams.go index 9dabf5976d6157..3a772fc3dae45b 100644 --- a/plugins/source/aws/resources/services/iot/streams.go +++ b/plugins/source/aws/resources/services/iot/streams.go @@ -36,7 +36,7 @@ func Streams() *schema.Table { func fetchIotStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListStreamsPaginator(svc, &iot.ListStreamsInput{ MaxResults: aws.Int32(250), }) @@ -54,7 +54,7 @@ func fetchIotStreams(ctx context.Context, meta schema.ClientMeta, parent *schema func getStream(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeStream(ctx, &iot.DescribeStreamInput{ StreamId: resource.Item.(types.StreamSummary).StreamId, diff --git a/plugins/source/aws/resources/services/iot/thing_groups.go b/plugins/source/aws/resources/services/iot/thing_groups.go index 4344c234e7b2de..a1dd4ca55ae665 100644 --- a/plugins/source/aws/resources/services/iot/thing_groups.go +++ b/plugins/source/aws/resources/services/iot/thing_groups.go @@ -57,7 +57,7 @@ func fetchIotThingGroups(ctx context.Context, meta schema.ClientMeta, parent *sc } cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListThingGroupsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iot.Options) { @@ -73,7 +73,7 @@ func fetchIotThingGroups(ctx context.Context, meta schema.ClientMeta, parent *sc func getThingGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.DescribeThingGroup(ctx, &iot.DescribeThingGroupInput{ ThingGroupName: resource.Item.(types.GroupNameAndArn).GroupName, @@ -90,7 +90,7 @@ func getThingGroup(ctx context.Context, meta schema.ClientMeta, resource *schema func ResolveIotThingGroupThingsInGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeThingGroupOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListThingsInThingGroupInput{ ThingGroupName: i.ThingGroupName, MaxResults: aws.Int32(250), @@ -113,7 +113,7 @@ func ResolveIotThingGroupThingsInGroup(ctx context.Context, meta schema.ClientMe func ResolveIotThingGroupPolicies(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeThingGroupOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListAttachedPoliciesInput{ Target: i.ThingGroupArn, PageSize: aws.Int32(250), @@ -137,6 +137,6 @@ func ResolveIotThingGroupPolicies(ctx context.Context, meta schema.ClientMeta, r func ResolveIotThingGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.DescribeThingGroupOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.ThingGroupArn) } diff --git a/plugins/source/aws/resources/services/iot/thing_types.go b/plugins/source/aws/resources/services/iot/thing_types.go index 2de9231554ecc1..201811eaf4c965 100644 --- a/plugins/source/aws/resources/services/iot/thing_types.go +++ b/plugins/source/aws/resources/services/iot/thing_types.go @@ -46,7 +46,7 @@ func fetchIotThingTypes(ctx context.Context, meta schema.ClientMeta, parent *sch } cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListThingTypesPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iot.Options) { @@ -63,6 +63,6 @@ func fetchIotThingTypes(ctx context.Context, meta schema.ClientMeta, parent *sch func ResolveIotThingTypeTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(types.ThingTypeDefinition) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.ThingTypeArn) } diff --git a/plugins/source/aws/resources/services/iot/things.go b/plugins/source/aws/resources/services/iot/things.go index d410d2b7423d46..f4f2cd3cb4f275 100644 --- a/plugins/source/aws/resources/services/iot/things.go +++ b/plugins/source/aws/resources/services/iot/things.go @@ -44,7 +44,7 @@ func fetchIotThings(ctx context.Context, meta schema.ClientMeta, parent *schema. } cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot paginator := iot.NewListThingsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *iot.Options) { @@ -60,7 +60,7 @@ func fetchIotThings(ctx context.Context, meta schema.ClientMeta, parent *schema. func ResolveIotThingPrincipals(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(types.ThingAttribute) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListThingPrincipalsInput{ ThingName: i.ThingName, MaxResults: aws.Int32(250), diff --git a/plugins/source/aws/resources/services/iot/topic_rules.go b/plugins/source/aws/resources/services/iot/topic_rules.go index 84690424ed646c..2698e77cec30c0 100644 --- a/plugins/source/aws/resources/services/iot/topic_rules.go +++ b/plugins/source/aws/resources/services/iot/topic_rules.go @@ -43,7 +43,7 @@ func TopicRules() *schema.Table { func fetchIotTopicRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot input := iot.ListTopicRulesInput{ MaxResults: aws.Int32(250), } @@ -62,7 +62,7 @@ func fetchIotTopicRules(ctx context.Context, meta schema.ClientMeta, parent *sch func getTopicRule(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot output, err := svc.GetTopicRule(ctx, &iot.GetTopicRuleInput{ RuleName: resource.Item.(types.TopicRuleListItem).RuleName, @@ -79,6 +79,6 @@ func getTopicRule(ctx context.Context, meta schema.ClientMeta, resource *schema. func resolveIotTopicRuleTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { i := resource.Item.(*iot.GetTopicRuleOutput) cl := meta.(*client.Client) - svc := cl.Services().Iot + svc := cl.Services(client.AWSServiceIot).Iot return resolveIotTags(ctx, meta, svc, resource, c, i.RuleArn) } diff --git a/plugins/source/aws/resources/services/kafka/cluster_operations.go b/plugins/source/aws/resources/services/kafka/cluster_operations.go index 0653ffdaff1ced..d50bfaffe0e0ef 100644 --- a/plugins/source/aws/resources/services/kafka/cluster_operations.go +++ b/plugins/source/aws/resources/services/kafka/cluster_operations.go @@ -51,7 +51,7 @@ func fetchKafkaClusterOperations(ctx context.Context, meta schema.ClientMeta, pa var input = getListClusterOperationsInput(parent) cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka paginator := kafka.NewListClusterOperationsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *kafka.Options) { diff --git a/plugins/source/aws/resources/services/kafka/clusters.go b/plugins/source/aws/resources/services/kafka/clusters.go index 7b2ba0c5b9305f..cb1217ae69cc34 100644 --- a/plugins/source/aws/resources/services/kafka/clusters.go +++ b/plugins/source/aws/resources/services/kafka/clusters.go @@ -40,7 +40,7 @@ func Clusters() *schema.Table { func fetchKafkaClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input kafka.ListClustersV2Input cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka paginator := kafka.NewListClustersV2Paginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *kafka.Options) { @@ -56,7 +56,7 @@ func fetchKafkaClusters(ctx context.Context, meta schema.ClientMeta, parent *sch func getCluster(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka var input kafka.DescribeClusterV2Input = describeClustersInput(resource) output, err := svc.DescribeClusterV2(ctx, &input, func(options *kafka.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/kafka/configurations.go b/plugins/source/aws/resources/services/kafka/configurations.go index 82d05d42976e77..2ec3ebb3929853 100644 --- a/plugins/source/aws/resources/services/kafka/configurations.go +++ b/plugins/source/aws/resources/services/kafka/configurations.go @@ -34,7 +34,7 @@ func Configurations() *schema.Table { func fetchKafkaConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input kafka.ListConfigurationsInput cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka paginator := kafka.NewListConfigurationsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *kafka.Options) { diff --git a/plugins/source/aws/resources/services/kafka/helpers.go b/plugins/source/aws/resources/services/kafka/helpers.go index 7f679565f77ff0..d650264f70c4a4 100644 --- a/plugins/source/aws/resources/services/kafka/helpers.go +++ b/plugins/source/aws/resources/services/kafka/helpers.go @@ -38,7 +38,7 @@ func resolveKafkaTags(path string) schema.ColumnResolver { } arn := funk.Get(r.Item, path, funk.WithAllowZero()).(*string) cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka params := kafka.ListTagsForResourceInput{ResourceArn: arn} output, err := svc.ListTagsForResource(ctx, ¶ms, func(options *kafka.Options) { diff --git a/plugins/source/aws/resources/services/kafka/nodes.go b/plugins/source/aws/resources/services/kafka/nodes.go index 9755cd213cf4a0..05d8a954b6cf1c 100644 --- a/plugins/source/aws/resources/services/kafka/nodes.go +++ b/plugins/source/aws/resources/services/kafka/nodes.go @@ -47,7 +47,7 @@ func fetchKafkaNodes(ctx context.Context, meta schema.ClientMeta, parent *schema var input = getListNodesInput(parent) cl := meta.(*client.Client) - svc := cl.Services().Kafka + svc := cl.Services(client.AWSServiceKafka).Kafka paginator := kafka.NewListNodesPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *kafka.Options) { diff --git a/plugins/source/aws/resources/services/kinesis/streams.go b/plugins/source/aws/resources/services/kinesis/streams.go index eab0d3221bda3c..0dfb1503cc6f17 100644 --- a/plugins/source/aws/resources/services/kinesis/streams.go +++ b/plugins/source/aws/resources/services/kinesis/streams.go @@ -43,7 +43,7 @@ func Streams() *schema.Table { func fetchKinesisStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Kinesis + svc := cl.Services(client.AWSServiceKinesis).Kinesis input := kinesis.ListStreamsInput{} paginator := kinesis.NewListStreamsPaginator(svc, &input) for paginator.HasMorePages() { @@ -61,7 +61,7 @@ func fetchKinesisStreams(ctx context.Context, meta schema.ClientMeta, parent *sc func getStream(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) streamName := resource.Item.(string) - svc := cl.Services().Kinesis + svc := cl.Services(client.AWSServiceKinesis).Kinesis streamSummary, err := svc.DescribeStreamSummary(ctx, &kinesis.DescribeStreamSummaryInput{ StreamName: aws.String(streamName), }, func(options *kinesis.Options) { @@ -76,7 +76,7 @@ func getStream(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func resolveKinesisStreamTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Kinesis + svc := cl.Services(client.AWSServiceKinesis).Kinesis summary := resource.Item.(*types.StreamDescriptionSummary) input := kinesis.ListTagsForStreamInput{ StreamName: summary.StreamName, diff --git a/plugins/source/aws/resources/services/kms/aliases.go b/plugins/source/aws/resources/services/kms/aliases.go index 14c2cef3ec6b7c..1743130711586b 100644 --- a/plugins/source/aws/resources/services/kms/aliases.go +++ b/plugins/source/aws/resources/services/kms/aliases.go @@ -35,7 +35,7 @@ func Aliases() *schema.Table { func fetchKmsAliases(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input kms.ListAliasesInput cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms paginator := kms.NewListAliasesPaginator(svc, &input) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *kms.Options) { diff --git a/plugins/source/aws/resources/services/kms/key_grants.go b/plugins/source/aws/resources/services/kms/key_grants.go index eb186e3b9f688e..6b12eb58c42d0f 100644 --- a/plugins/source/aws/resources/services/kms/key_grants.go +++ b/plugins/source/aws/resources/services/kms/key_grants.go @@ -46,7 +46,7 @@ func fetchKmsKeyGrants(ctx context.Context, meta schema.ClientMeta, parent *sche } cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms p := kms.NewListGrantsPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *kms.Options) { diff --git a/plugins/source/aws/resources/services/kms/key_policies.go b/plugins/source/aws/resources/services/kms/key_policies.go index 9f9ae927f0b545..264e6cc26ea644 100644 --- a/plugins/source/aws/resources/services/kms/key_policies.go +++ b/plugins/source/aws/resources/services/kms/key_policies.go @@ -52,7 +52,7 @@ func keyPolicies() *schema.Table { func fetchKeyPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms const policyName = "default" diff --git a/plugins/source/aws/resources/services/kms/keys.go b/plugins/source/aws/resources/services/kms/keys.go index a054d338486ccc..c25cfed4f36900 100644 --- a/plugins/source/aws/resources/services/kms/keys.go +++ b/plugins/source/aws/resources/services/kms/keys.go @@ -57,7 +57,7 @@ func Keys() *schema.Table { func fetchKmsKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms config := kms.ListKeysInput{Limit: aws.Int32(1000)} p := kms.NewListKeysPaginator(svc, &config) @@ -75,7 +75,7 @@ func fetchKmsKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Re func getKey(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms item := resource.Item.(types.KeyListEntry) d, err := svc.DescribeKey(ctx, &kms.DescribeKeyInput{KeyId: item.KeyId}, func(options *kms.Options) { @@ -102,7 +102,7 @@ func resolveKeysTags(ctx context.Context, meta schema.ClientMeta, resource *sche return nil } cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms params := kms.ListResourceTagsInput{KeyId: key.KeyId} paginator := kms.NewListResourceTagsPaginator(svc, ¶ms) tags := make(map[string]string) @@ -127,7 +127,7 @@ func resolveKeysRotationEnabled(ctx context.Context, meta schema.ClientMeta, res return nil } cl := meta.(*client.Client) - svc := cl.Services().Kms + svc := cl.Services(client.AWSServiceKms).Kms result, err := svc.GetKeyRotationStatus(ctx, &kms.GetKeyRotationStatusInput{KeyId: key.KeyId}, func(options *kms.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lambda/function_aliases.go b/plugins/source/aws/resources/services/lambda/function_aliases.go index 01a90615e024e0..e0f58c6d13ce3d 100644 --- a/plugins/source/aws/resources/services/lambda/function_aliases.go +++ b/plugins/source/aws/resources/services/lambda/function_aliases.go @@ -45,7 +45,7 @@ func fetchLambdaFunctionAliases(ctx context.Context, meta schema.ClientMeta, par } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListAliasesInput{ FunctionName: p.Configuration.FunctionName, } @@ -70,7 +70,7 @@ func fetchLambdaFunctionAliases(ctx context.Context, meta schema.ClientMeta, par func getFunctionAliasURLConfig(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda alias := resource.Item.(types.AliasConfiguration) p := resource.Parent.Item.(*lambda.GetFunctionOutput) diff --git a/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go b/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go index 5240b73e17c46f..aaf212a00cdf54 100644 --- a/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_concurrency_configs.go @@ -37,7 +37,7 @@ func fetchLambdaFunctionConcurrencyConfigs(ctx context.Context, meta schema.Clie } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListProvisionedConcurrencyConfigsInput{ FunctionName: p.Configuration.FunctionName, } diff --git a/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go b/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go index c8e0f87c1121e6..72a04e2eaecd83 100644 --- a/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go +++ b/plugins/source/aws/resources/services/lambda/function_event_invoke_configs.go @@ -35,7 +35,7 @@ func fetchLambdaFunctionEventInvokeConfigs(ctx context.Context, meta schema.Clie return nil } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListFunctionEventInvokeConfigsInput{ FunctionName: p.Configuration.FunctionName, } diff --git a/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go b/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go index ae266ad9866252..0b39f87f28dc68 100644 --- a/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go +++ b/plugins/source/aws/resources/services/lambda/function_event_source_mappings.go @@ -37,7 +37,7 @@ func fetchLambdaFunctionEventSourceMappings(ctx context.Context, meta schema.Cli } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListEventSourceMappingsInput{ FunctionName: p.Configuration.FunctionName, } diff --git a/plugins/source/aws/resources/services/lambda/function_versions.go b/plugins/source/aws/resources/services/lambda/function_versions.go index 4972fd08696869..0df15aad8d8635 100644 --- a/plugins/source/aws/resources/services/lambda/function_versions.go +++ b/plugins/source/aws/resources/services/lambda/function_versions.go @@ -38,7 +38,7 @@ func fetchLambdaFunctionVersions(ctx context.Context, meta schema.ClientMeta, pa } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListVersionsByFunctionInput{ FunctionName: p.Configuration.FunctionName, } diff --git a/plugins/source/aws/resources/services/lambda/functions.go b/plugins/source/aws/resources/services/lambda/functions.go index 1f91c21798d516..62eb4a14c3e97f 100644 --- a/plugins/source/aws/resources/services/lambda/functions.go +++ b/plugins/source/aws/resources/services/lambda/functions.go @@ -77,7 +77,7 @@ func Functions() *schema.Table { func fetchLambdaFunctions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda paginator := lambda.NewListFunctionsPaginator(svc, &lambda.ListFunctionsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *lambda.Options) { @@ -93,7 +93,7 @@ func fetchLambdaFunctions(ctx context.Context, meta schema.ClientMeta, parent *s func getFunction(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda f := resource.Item.(types.FunctionConfiguration) funcResponse, err := svc.GetFunction(ctx, &lambda.GetFunctionInput{ @@ -131,7 +131,7 @@ func resolveCodeSigningConfig(ctx context.Context, meta schema.ClientMeta, resou return nil } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda // skip getting CodeSigningConfig since containerized lambda functions does not support this feature // value can be nil if the caller doesn't have GetFunctionConfiguration permission and only has List* @@ -177,7 +177,7 @@ func resolveResourcePolicy(ctx context.Context, meta schema.ClientMeta, resource } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda response, err := svc.GetPolicy(ctx, &lambda.GetPolicyInput{ FunctionName: r.Configuration.FunctionName, @@ -211,7 +211,7 @@ func resolveRuntimeManagementConfig(ctx context.Context, meta schema.ClientMeta, return nil } cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda runtimeManagementConfig, err := svc.GetRuntimeManagementConfig(ctx, &lambda.GetRuntimeManagementConfigInput{ FunctionName: r.Configuration.FunctionName, diff --git a/plugins/source/aws/resources/services/lambda/layers.go b/plugins/source/aws/resources/services/lambda/layers.go index 9b1779882c720a..3e4aab0e9eef79 100644 --- a/plugins/source/aws/resources/services/lambda/layers.go +++ b/plugins/source/aws/resources/services/lambda/layers.go @@ -39,7 +39,7 @@ func Layers() *schema.Table { func fetchLambdaLayers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lambda.ListLayersInput cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda paginator := lambda.NewListLayersPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *lambda.Options) { @@ -56,7 +56,7 @@ func fetchLambdaLayers(ctx context.Context, meta schema.ClientMeta, parent *sche func fetchLambdaLayerVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { p := parent.Item.(types.LayersListItem) cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.ListLayerVersionsInput{ LayerName: p.LayerName, } @@ -77,7 +77,7 @@ func fetchLambdaLayerVersionPolicies(ctx context.Context, meta schema.ClientMeta pp := parent.Parent.Item.(types.LayersListItem) cl := meta.(*client.Client) - svc := cl.Services().Lambda + svc := cl.Services(client.AWSServiceLambda).Lambda config := lambda.GetLayerVersionPolicyInput{ LayerName: pp.LayerName, diff --git a/plugins/source/aws/resources/services/lightsail/alarms.go b/plugins/source/aws/resources/services/lightsail/alarms.go index 6cbeecf00a3fd1..7fe9ddf80428a8 100644 --- a/plugins/source/aws/resources/services/lightsail/alarms.go +++ b/plugins/source/aws/resources/services/lightsail/alarms.go @@ -35,7 +35,7 @@ func Alarms() *schema.Table { func fetchLightsailAlarms(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetAlarmsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetAlarms(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go b/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go index fb54e423c00262..482c197a6920d9 100644 --- a/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go +++ b/plugins/source/aws/resources/services/lightsail/bucket_access_keys.go @@ -33,7 +33,7 @@ func bucketAccessKeys() *schema.Table { func fetchLightsailBucketAccessKeys(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.Bucket) cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail input := lightsail.GetBucketAccessKeysInput{ BucketName: r.Name, } diff --git a/plugins/source/aws/resources/services/lightsail/buckets.go b/plugins/source/aws/resources/services/lightsail/buckets.go index 46249dd9286efe..247a081b590699 100644 --- a/plugins/source/aws/resources/services/lightsail/buckets.go +++ b/plugins/source/aws/resources/services/lightsail/buckets.go @@ -46,7 +46,7 @@ func Buckets() *schema.Table { func fetchLightsailBuckets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetBucketsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetBuckets(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/certificates.go b/plugins/source/aws/resources/services/lightsail/certificates.go index dd66cf379c9d94..852694e9a25a44 100644 --- a/plugins/source/aws/resources/services/lightsail/certificates.go +++ b/plugins/source/aws/resources/services/lightsail/certificates.go @@ -37,7 +37,7 @@ func fetchLightsailCertificates(ctx context.Context, meta schema.ClientMeta, par IncludeCertificateDetails: true, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail response, err := svc.GetCertificates(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lightsail/container_service_deployments.go b/plugins/source/aws/resources/services/lightsail/container_service_deployments.go index c24708a460b14b..5d55bd9d28e674 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_deployments.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_deployments.go @@ -36,7 +36,7 @@ func fetchLightsailContainerServiceDeployments(ctx context.Context, meta schema. ServiceName: r.ContainerServiceName, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail deployments, err := svc.GetContainerServiceDeployments(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lightsail/container_service_images.go b/plugins/source/aws/resources/services/lightsail/container_service_images.go index ca9fb3892f140c..0d5e02f88aab14 100644 --- a/plugins/source/aws/resources/services/lightsail/container_service_images.go +++ b/plugins/source/aws/resources/services/lightsail/container_service_images.go @@ -36,7 +36,7 @@ func fetchLightsailContainerServiceImages(ctx context.Context, meta schema.Clien ServiceName: r.ContainerServiceName, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail deployments, err := svc.GetContainerImages(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lightsail/container_services.go b/plugins/source/aws/resources/services/lightsail/container_services.go index 96043491895868..3d576c2f88368b 100644 --- a/plugins/source/aws/resources/services/lightsail/container_services.go +++ b/plugins/source/aws/resources/services/lightsail/container_services.go @@ -46,7 +46,7 @@ func ContainerServices() *schema.Table { func fetchLightsailContainerServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetContainerServicesInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail response, err := svc.GetContainerServices(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lightsail/database_events.go b/plugins/source/aws/resources/services/lightsail/database_events.go index 420020f81ed0db..9440ad399711ff 100644 --- a/plugins/source/aws/resources/services/lightsail/database_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_events.go @@ -38,7 +38,7 @@ func fetchLightsailDatabaseEvents(ctx context.Context, meta schema.ClientMeta, p DurationInMinutes: aws.Int32(20160), // two weeks } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetRelationalDatabaseEvents(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/database_log_events.go b/plugins/source/aws/resources/services/lightsail/database_log_events.go index 6899421f10c667..7e687c59824173 100644 --- a/plugins/source/aws/resources/services/lightsail/database_log_events.go +++ b/plugins/source/aws/resources/services/lightsail/database_log_events.go @@ -40,7 +40,7 @@ func fetchLightsailDatabaseLogEvents(ctx context.Context, meta schema.ClientMeta RelationalDatabaseName: r.Name, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail streams, err := svc.GetRelationalDatabaseLogStreams(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) @@ -66,7 +66,7 @@ func fetchLightsailDatabaseLogEvents(ctx context.Context, meta schema.ClientMeta } func fetchLogEvents(ctx context.Context, res chan<- any, cl *client.Client, database, stream string, startTime, endTime time.Time) error { - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail input := lightsail.GetRelationalDatabaseLogEventsInput{ RelationalDatabaseName: &database, LogStreamName: &stream, diff --git a/plugins/source/aws/resources/services/lightsail/database_parameters.go b/plugins/source/aws/resources/services/lightsail/database_parameters.go index f3c570665d3723..142cbd4c300629 100644 --- a/plugins/source/aws/resources/services/lightsail/database_parameters.go +++ b/plugins/source/aws/resources/services/lightsail/database_parameters.go @@ -37,7 +37,7 @@ func fetchLightsailDatabaseParameters(ctx context.Context, meta schema.ClientMet RelationalDatabaseName: r.Name, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetRelationalDatabaseParameters(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/database_snapshots.go b/plugins/source/aws/resources/services/lightsail/database_snapshots.go index cf4d368bb201a6..16328a880e8952 100644 --- a/plugins/source/aws/resources/services/lightsail/database_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/database_snapshots.go @@ -42,7 +42,7 @@ func DatabaseSnapshots() *schema.Table { func fetchLightsailDatabaseSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetRelationalDatabaseSnapshotsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetRelationalDatabaseSnapshots(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/databases.go b/plugins/source/aws/resources/services/lightsail/databases.go index 081ab84a5a2f8f..b65e18645e3773 100644 --- a/plugins/source/aws/resources/services/lightsail/databases.go +++ b/plugins/source/aws/resources/services/lightsail/databases.go @@ -42,7 +42,7 @@ func Databases() *schema.Table { func fetchLightsailDatabases(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetRelationalDatabasesInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetRelationalDatabases(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go index 015e71bf3d3f52..07c54b0f4c936b 100644 --- a/plugins/source/aws/resources/services/lightsail/disk_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/disk_snapshots.go @@ -41,7 +41,7 @@ func diskSnapshots() *schema.Table { func fetchLightsailDiskSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetDiskSnapshotsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetDiskSnapshots(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/disks.go b/plugins/source/aws/resources/services/lightsail/disks.go index def6df9785a806..1a2611b8564ec2 100644 --- a/plugins/source/aws/resources/services/lightsail/disks.go +++ b/plugins/source/aws/resources/services/lightsail/disks.go @@ -46,7 +46,7 @@ func Disks() *schema.Table { func fetchLightsailDisks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetDisksInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail for { response, err := svc.GetDisks(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/lightsail/distributions.go b/plugins/source/aws/resources/services/lightsail/distributions.go index fde3e618298796..aa13bf23557f02 100644 --- a/plugins/source/aws/resources/services/lightsail/distributions.go +++ b/plugins/source/aws/resources/services/lightsail/distributions.go @@ -45,7 +45,7 @@ func Distributions() *schema.Table { func fetchLightsailDistributions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetDistributionsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { // Validate the region for this in client/data.json @@ -80,7 +80,7 @@ func fetchLightsailDistributions(ctx context.Context, meta schema.ClientMeta, pa } func fetchCacheReset(ctx context.Context, res chan<- any, cl *client.Client, d types.LightsailDistribution) error { - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail resetInput := lightsail.GetDistributionLatestCacheResetInput{ DistributionName: d.Name, } diff --git a/plugins/source/aws/resources/services/lightsail/instance_port_states.go b/plugins/source/aws/resources/services/lightsail/instance_port_states.go index 7a8e859a21375e..21ca55255c21f9 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_port_states.go +++ b/plugins/source/aws/resources/services/lightsail/instance_port_states.go @@ -33,7 +33,7 @@ func instancePortStates() *schema.Table { func fetchLightsailInstancePortStates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(types.Instance) cli := meta.(*client.Client) - svc := cli.Services().Lightsail + svc := cli.Services(client.AWSServiceLightsail).Lightsail input := lightsail.GetInstancePortStatesInput{InstanceName: r.Name} output, err := svc.GetInstancePortStates(ctx, &input, func(options *lightsail.Options) { options.Region = cli.Region diff --git a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go index 5e6d7325bca560..50b69b01be41b4 100644 --- a/plugins/source/aws/resources/services/lightsail/instance_snapshots.go +++ b/plugins/source/aws/resources/services/lightsail/instance_snapshots.go @@ -42,7 +42,7 @@ func InstanceSnapshots() *schema.Table { func fetchLightsailInstanceSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetInstanceSnapshotsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetInstanceSnapshots(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/instances.go b/plugins/source/aws/resources/services/lightsail/instances.go index a652843ca1f7ba..2e1fd4a9e0e5f8 100644 --- a/plugins/source/aws/resources/services/lightsail/instances.go +++ b/plugins/source/aws/resources/services/lightsail/instances.go @@ -50,7 +50,7 @@ func Instances() *schema.Table { func fetchLightsailInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail input := lightsail.GetInstancesInput{} // No paginator available for { @@ -72,7 +72,7 @@ func fetchLightsailInstances(ctx context.Context, meta schema.ClientMeta, parent func resolveLightsailInstanceAccessDetails(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.Instance) cli := meta.(*client.Client) - svc := cli.Services().Lightsail + svc := cli.Services(client.AWSServiceLightsail).Lightsail input := lightsail.GetInstanceAccessDetailsInput{InstanceName: r.Name} output, err := svc.GetInstanceAccessDetails(ctx, &input, func(options *lightsail.Options) { options.Region = cli.Region diff --git a/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go b/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go index 18cc5a78d6a760..a21fc4d66dd129 100644 --- a/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go +++ b/plugins/source/aws/resources/services/lightsail/load_balancer_tls_certificates.go @@ -43,7 +43,7 @@ func fetchLightsailLoadBalancerTlsCertificates(ctx context.Context, meta schema. LoadBalancerName: r.Name, } cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail response, err := svc.GetLoadBalancerTlsCertificates(ctx, &input, func(options *lightsail.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/lightsail/load_balancers.go b/plugins/source/aws/resources/services/lightsail/load_balancers.go index b841c301aec4f6..26981a3a21acfe 100644 --- a/plugins/source/aws/resources/services/lightsail/load_balancers.go +++ b/plugins/source/aws/resources/services/lightsail/load_balancers.go @@ -46,7 +46,7 @@ func LoadBalancers() *schema.Table { func fetchLightsailLoadBalancers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetLoadBalancersInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetLoadBalancers(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/lightsail/static_ips.go b/plugins/source/aws/resources/services/lightsail/static_ips.go index 62862389044bc0..3d073c3a3a2fb2 100644 --- a/plugins/source/aws/resources/services/lightsail/static_ips.go +++ b/plugins/source/aws/resources/services/lightsail/static_ips.go @@ -35,7 +35,7 @@ func StaticIps() *schema.Table { func fetchLightsailStaticIps(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input lightsail.GetStaticIpsInput cl := meta.(*client.Client) - svc := cl.Services().Lightsail + svc := cl.Services(client.AWSServiceLightsail).Lightsail // No paginator available for { response, err := svc.GetStaticIps(ctx, &input, func(options *lightsail.Options) { diff --git a/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go b/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go index 362c0180b052d9..83ab95b3e26f8c 100644 --- a/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go +++ b/plugins/source/aws/resources/services/mq/broker_configuration_revisions.go @@ -48,7 +48,7 @@ func brokerConfigurationRevisions() *schema.Table { func fetchMqBrokerConfigurationRevisions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cfg := parent.Item.(mq.DescribeConfigurationOutput) cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq input := mq.ListConfigurationRevisionsInput{ConfigurationId: cfg.Id} // No paginator available @@ -71,7 +71,7 @@ func fetchMqBrokerConfigurationRevisions(ctx context.Context, meta schema.Client func getMqBrokerConfigurationRevision(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq rev := resource.Item.(types.ConfigurationRevision) cfg := resource.Parent.Item.(mq.DescribeConfigurationOutput) diff --git a/plugins/source/aws/resources/services/mq/broker_configurations.go b/plugins/source/aws/resources/services/mq/broker_configurations.go index 2b4bfd68b0f1f7..da9b3e34b6c8f0 100644 --- a/plugins/source/aws/resources/services/mq/broker_configurations.go +++ b/plugins/source/aws/resources/services/mq/broker_configurations.go @@ -41,7 +41,7 @@ func fetchMqBrokerConfigurations(ctx context.Context, meta schema.ClientMeta, pa return nil } cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq list := broker.Configurations.History if broker.Configurations.Current != nil { list = append(list, *broker.Configurations.Current) diff --git a/plugins/source/aws/resources/services/mq/broker_users.go b/plugins/source/aws/resources/services/mq/broker_users.go index 089101c07567b2..a0b2d346ee08f7 100644 --- a/plugins/source/aws/resources/services/mq/broker_users.go +++ b/plugins/source/aws/resources/services/mq/broker_users.go @@ -32,7 +32,7 @@ func brokerUsers() *schema.Table { func fetchMqBrokerUsers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { broker := parent.Item.(*mq.DescribeBrokerOutput) cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq for _, us := range broker.Users { input := mq.DescribeUserInput{ BrokerId: broker.BrokerId, diff --git a/plugins/source/aws/resources/services/mq/brokers.go b/plugins/source/aws/resources/services/mq/brokers.go index 793bf8b1e5600f..14d8f0b9fa1d5c 100644 --- a/plugins/source/aws/resources/services/mq/brokers.go +++ b/plugins/source/aws/resources/services/mq/brokers.go @@ -41,7 +41,7 @@ func Brokers() *schema.Table { func fetchMqBrokers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config mq.ListBrokersInput cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq paginator := mq.NewListBrokersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *mq.Options) { @@ -57,7 +57,7 @@ func fetchMqBrokers(ctx context.Context, meta schema.ClientMeta, parent *schema. func getMqBroker(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Mq + svc := cl.Services(client.AWSServiceMq).Mq bs := resource.Item.(types.BrokerSummary) output, err := svc.DescribeBroker(ctx, &mq.DescribeBrokerInput{BrokerId: bs.BrokerId}, func(options *mq.Options) { diff --git a/plugins/source/aws/resources/services/mwaa/environments.go b/plugins/source/aws/resources/services/mwaa/environments.go index 30652423803125..d4ce632b1b1b47 100644 --- a/plugins/source/aws/resources/services/mwaa/environments.go +++ b/plugins/source/aws/resources/services/mwaa/environments.go @@ -36,7 +36,7 @@ func Environments() *schema.Table { func fetchMwaaEnvironments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { config := mwaa.ListEnvironmentsInput{} cl := meta.(*client.Client) - svc := cl.Services().Mwaa + svc := cl.Services(client.AWSServiceMwaa).Mwaa p := mwaa.NewListEnvironmentsPaginator(svc, &config) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *mwaa.Options) { @@ -52,7 +52,7 @@ func fetchMwaaEnvironments(ctx context.Context, meta schema.ClientMeta, parent * func getEnvironment(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Mwaa + svc := cl.Services(client.AWSServiceMwaa).Mwaa name := resource.Item.(string) output, err := svc.GetEnvironment(ctx, &mwaa.GetEnvironmentInput{Name: &name}, func(options *mwaa.Options) { diff --git a/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go b/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go index 08f34b225c39a8..3ba28f163b8370 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go +++ b/plugins/source/aws/resources/services/neptune/cluster_parameter_group_parameters.go @@ -32,7 +32,7 @@ func clusterParameterGroupParameters() *schema.Table { func fetchNeptuneClusterParameterGroupParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune g := parent.Item.(types.DBClusterParameterGroup) input := neptune.DescribeDBClusterParametersInput{DBClusterParameterGroupName: g.DBClusterParameterGroupName} paginator := neptune.NewDescribeDBClusterParametersPaginator(svc, &input) @@ -51,7 +51,7 @@ func fetchNeptuneClusterParameterGroupParameters(ctx context.Context, meta schem func resolveNeptuneClusterParameterGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBClusterParameterGroup) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: g.DBClusterParameterGroupArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go b/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go index 795adff6a86e84..8f6cbd275b66d6 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/cluster_parameter_groups.go @@ -46,7 +46,7 @@ func ClusterParameterGroups() *schema.Table { func fetchNeptuneClusterParameterGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune input := neptune.DescribeDBClusterParameterGroupsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"neptune"}}}, } diff --git a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go index cc9cacacd76f4b..6984675ca59cda 100644 --- a/plugins/source/aws/resources/services/neptune/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/neptune/cluster_snapshots.go @@ -47,7 +47,7 @@ func ClusterSnapshots() *schema.Table { func fetchNeptuneClusterSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune input := neptune.DescribeDBClusterSnapshotsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"neptune"}}}, } @@ -67,7 +67,7 @@ func fetchNeptuneClusterSnapshots(ctx context.Context, meta schema.ClientMeta, p func resolveNeptuneClusterSnapshotAttributes(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, column schema.Column) error { s := resource.Item.(types.DBClusterSnapshot) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.DescribeDBClusterSnapshotAttributes( ctx, &neptune.DescribeDBClusterSnapshotAttributesInput{DBClusterSnapshotIdentifier: s.DBClusterSnapshotIdentifier}, @@ -91,7 +91,7 @@ func resolveNeptuneClusterSnapshotAttributes(ctx context.Context, meta schema.Cl func resolveNeptuneClusterSnapshotTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.DBClusterSnapshot) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: s.DBClusterSnapshotArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/clusters.go b/plugins/source/aws/resources/services/neptune/clusters.go index cdbec8ac601cb8..3281432005052b 100644 --- a/plugins/source/aws/resources/services/neptune/clusters.go +++ b/plugins/source/aws/resources/services/neptune/clusters.go @@ -45,7 +45,7 @@ func fetchNeptuneClusters(ctx context.Context, meta schema.ClientMeta, parent *s Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"neptune"}}}, } cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune paginator := neptune.NewDescribeDBClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *neptune.Options) { @@ -62,7 +62,7 @@ func fetchNeptuneClusters(ctx context.Context, meta schema.ClientMeta, parent *s func resolveNeptuneClusterTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.DBCluster) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: s.DBClusterArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/db_parameter_groups.go b/plugins/source/aws/resources/services/neptune/db_parameter_groups.go index c72e979c7c62e3..b87cfbf65fdbaf 100644 --- a/plugins/source/aws/resources/services/neptune/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/neptune/db_parameter_groups.go @@ -46,7 +46,7 @@ func DbParameterGroups() *schema.Table { func fetchNeptuneDbParameterGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune input := neptune.DescribeDBParameterGroupsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"neptune"}}}, } @@ -65,7 +65,7 @@ func fetchNeptuneDbParameterGroups(ctx context.Context, meta schema.ClientMeta, func fetchNeptuneDbParameterGroupDbParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune g := parent.Item.(types.DBParameterGroup) input := neptune.DescribeDBParametersInput{DBParameterGroupName: g.DBParameterGroupName} paginator := neptune.NewDescribeDBParametersPaginator(svc, &input) @@ -88,7 +88,7 @@ func fetchNeptuneDbParameterGroupDbParameters(ctx context.Context, meta schema.C func resolveNeptuneDbParameterGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBParameterGroup) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: g.DBParameterGroupArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/event_subscriptions.go b/plugins/source/aws/resources/services/neptune/event_subscriptions.go index 88e13c93f93f10..62c03080d21eef 100644 --- a/plugins/source/aws/resources/services/neptune/event_subscriptions.go +++ b/plugins/source/aws/resources/services/neptune/event_subscriptions.go @@ -42,7 +42,7 @@ func EventSubscriptions() *schema.Table { func fetchNeptuneEventSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune input := neptune.DescribeEventSubscriptionsInput{ Filters: []types.Filter{{Name: aws.String("engine"), Values: []string{"neptune"}}}, } @@ -62,7 +62,7 @@ func fetchNeptuneEventSubscriptions(ctx context.Context, meta schema.ClientMeta, func resolveNeptuneEventSubscriptionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.EventSubscription) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: s.EventSubscriptionArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/global_clusters.go b/plugins/source/aws/resources/services/neptune/global_clusters.go index 4e41ff8d3a2190..da5dc93458731e 100644 --- a/plugins/source/aws/resources/services/neptune/global_clusters.go +++ b/plugins/source/aws/resources/services/neptune/global_clusters.go @@ -34,7 +34,7 @@ func GlobalClusters() *schema.Table { func fetchNeptuneGlobalClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config neptune.DescribeGlobalClustersInput cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune paginator := neptune.NewDescribeGlobalClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *neptune.Options) { diff --git a/plugins/source/aws/resources/services/neptune/instances.go b/plugins/source/aws/resources/services/neptune/instances.go index fb510ccd40d41a..905da47e9a009e 100644 --- a/plugins/source/aws/resources/services/neptune/instances.go +++ b/plugins/source/aws/resources/services/neptune/instances.go @@ -46,7 +46,7 @@ func fetchNeptuneInstances(ctx context.Context, meta schema.ClientMeta, parent * } cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune paginator := neptune.NewDescribeDBInstancesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *neptune.Options) { @@ -63,7 +63,7 @@ func fetchNeptuneInstances(ctx context.Context, meta schema.ClientMeta, parent * func resolveNeptuneInstanceTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.DBInstance) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: s.DBInstanceArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/neptune/subnet_groups.go b/plugins/source/aws/resources/services/neptune/subnet_groups.go index 02e70577365b56..266f7f55a24dea 100644 --- a/plugins/source/aws/resources/services/neptune/subnet_groups.go +++ b/plugins/source/aws/resources/services/neptune/subnet_groups.go @@ -71,7 +71,7 @@ func fetchNeptuneSubnetGroups(ctx context.Context, meta schema.ClientMeta, paren } cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune paginator := neptune.NewDescribeDBSubnetGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *neptune.Options) { @@ -88,7 +88,7 @@ func fetchNeptuneSubnetGroups(ctx context.Context, meta schema.ClientMeta, paren func resolveNeptuneSubnetGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.DBSubnetGroup) cl := meta.(*client.Client) - svc := cl.Services().Neptune + svc := cl.Services(client.AWSServiceNeptune).Neptune out, err := svc.ListTagsForResource(ctx, &neptune.ListTagsForResourceInput{ResourceName: s.DBSubnetGroupArn}, func(options *neptune.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go b/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go index faec20aa739634..3ffdf9ef35387d 100644 --- a/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go +++ b/plugins/source/aws/resources/services/networkfirewall/firewall_policies.go @@ -47,7 +47,7 @@ func FirewallPolicies() *schema.Table { func fetchFirewallPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input networkfirewall.ListFirewallPoliciesInput cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall p := networkfirewall.NewListFirewallPoliciesPaginator(svc, &input) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *networkfirewall.Options) { @@ -63,7 +63,7 @@ func fetchFirewallPolicies(ctx context.Context, meta schema.ClientMeta, parent * func getFirewallPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall metadata := resource.Item.(types.FirewallPolicyMetadata) policy, err := svc.DescribeFirewallPolicy(ctx, &networkfirewall.DescribeFirewallPolicyInput{ diff --git a/plugins/source/aws/resources/services/networkfirewall/firewalls.go b/plugins/source/aws/resources/services/networkfirewall/firewalls.go index 1743c481ed982d..e44a7db38ac43b 100644 --- a/plugins/source/aws/resources/services/networkfirewall/firewalls.go +++ b/plugins/source/aws/resources/services/networkfirewall/firewalls.go @@ -46,7 +46,7 @@ func Firewalls() *schema.Table { func fetchFirewalls(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input networkfirewall.ListFirewallsInput cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall p := networkfirewall.NewListFirewallsPaginator(svc, &input) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *networkfirewall.Options) { @@ -63,7 +63,7 @@ func fetchFirewalls(ctx context.Context, meta schema.ClientMeta, parent *schema. func getFirewall(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall metadata := resource.Item.(types.FirewallMetadata) firewallDetails, err := svc.DescribeFirewall(ctx, &networkfirewall.DescribeFirewallInput{ diff --git a/plugins/source/aws/resources/services/networkfirewall/rule_groups.go b/plugins/source/aws/resources/services/networkfirewall/rule_groups.go index b21e943782c21b..3d38350d00dae6 100644 --- a/plugins/source/aws/resources/services/networkfirewall/rule_groups.go +++ b/plugins/source/aws/resources/services/networkfirewall/rule_groups.go @@ -47,7 +47,7 @@ func RuleGroups() *schema.Table { func fetchRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input networkfirewall.ListRuleGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall p := networkfirewall.NewListRuleGroupsPaginator(svc, &input) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *networkfirewall.Options) { @@ -64,7 +64,7 @@ func fetchRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema func getRuleGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall metadata := resource.Item.(types.RuleGroupMetadata) ruleGroup, err := svc.DescribeRuleGroup(ctx, &networkfirewall.DescribeRuleGroupInput{ diff --git a/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go b/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go index 780be78dee9d6c..4c135c6baaa474 100644 --- a/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go +++ b/plugins/source/aws/resources/services/networkfirewall/tls_inspection_configurations.go @@ -46,7 +46,7 @@ func TLSInspectionConfigurations() *schema.Table { func fetchTLSInspectionConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input networkfirewall.ListTLSInspectionConfigurationsInput cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall p := networkfirewall.NewListTLSInspectionConfigurationsPaginator(svc, &input) for p.HasMorePages() { response, err := p.NextPage(ctx, func(options *networkfirewall.Options) { @@ -63,7 +63,7 @@ func fetchTLSInspectionConfigurations(ctx context.Context, meta schema.ClientMet func getTLSInspectionConfigurations(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Networkfirewall + svc := cl.Services(client.AWSServiceNetworkfirewall).Networkfirewall metadata := resource.Item.(types.TLSInspectionConfigurationMetadata) tlsInspectionConfigurationDetails, err := svc.DescribeTLSInspectionConfiguration(ctx, &networkfirewall.DescribeTLSInspectionConfigurationInput{ diff --git a/plugins/source/aws/resources/services/networkmanager/global_networks.go b/plugins/source/aws/resources/services/networkmanager/global_networks.go index 8e7b19ac0a3292..169aeaee450288 100644 --- a/plugins/source/aws/resources/services/networkmanager/global_networks.go +++ b/plugins/source/aws/resources/services/networkmanager/global_networks.go @@ -54,7 +54,7 @@ The 'request_region' column is added to show region of where the request was ma func fetchNetworks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Networkmanager + svc := cl.Services(client.AWSServiceNetworkmanager).Networkmanager paginator := networkmanager.NewDescribeGlobalNetworksPaginator(svc, nil) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *networkmanager.Options) { diff --git a/plugins/source/aws/resources/services/networkmanager/link.go b/plugins/source/aws/resources/services/networkmanager/link.go index 2278e4f670004b..77fd0f6b9ce453 100644 --- a/plugins/source/aws/resources/services/networkmanager/link.go +++ b/plugins/source/aws/resources/services/networkmanager/link.go @@ -45,7 +45,7 @@ The 'request_region' column is added to show region of where the request was ma func fetchLinks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Networkmanager + svc := cl.Services(client.AWSServiceNetworkmanager).Networkmanager globalNetwork := parent.Item.(types.GlobalNetwork) input := &networkmanager.GetLinksInput{ GlobalNetworkId: globalNetwork.GlobalNetworkId, diff --git a/plugins/source/aws/resources/services/networkmanager/sites.go b/plugins/source/aws/resources/services/networkmanager/sites.go index 4c6d1081825d37..65d7d6b9c3bb25 100644 --- a/plugins/source/aws/resources/services/networkmanager/sites.go +++ b/plugins/source/aws/resources/services/networkmanager/sites.go @@ -46,7 +46,7 @@ The 'request_region' column is added to show region of where the request was ma func fetchSites(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Networkmanager + svc := cl.Services(client.AWSServiceNetworkmanager).Networkmanager globalNetwork := parent.Item.(types.GlobalNetwork) input := &networkmanager.GetSitesInput{ GlobalNetworkId: globalNetwork.GlobalNetworkId, diff --git a/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go b/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go index baed17d4d333bc..aac0140d9475fd 100644 --- a/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go +++ b/plugins/source/aws/resources/services/networkmanager/transit_gateway_registrations.go @@ -33,7 +33,7 @@ The 'request_region' column is added to show region of where the request was ma func fetchTransitGatewayRegistration(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Networkmanager + svc := cl.Services(client.AWSServiceNetworkmanager).Networkmanager globalNetwork := parent.Item.(types.GlobalNetwork) input := &networkmanager.GetTransitGatewayRegistrationsInput{ GlobalNetworkId: globalNetwork.GlobalNetworkId, diff --git a/plugins/source/aws/resources/services/organizations/account_parents.go b/plugins/source/aws/resources/services/organizations/account_parents.go index 93428f5d1c358e..6d28179e18d981 100644 --- a/plugins/source/aws/resources/services/organizations/account_parents.go +++ b/plugins/source/aws/resources/services/organizations/account_parents.go @@ -43,7 +43,7 @@ The 'request_account_id' column is added to show from where the request was made } func fetchParents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations resp, err := svc.ListParents(ctx, &organizations.ListParentsInput{ ChildId: parent.Item.(types.Account).Id, diff --git a/plugins/source/aws/resources/services/organizations/accounts.go b/plugins/source/aws/resources/services/organizations/accounts.go index 038684a0546c90..f9607a97662789 100644 --- a/plugins/source/aws/resources/services/organizations/accounts.go +++ b/plugins/source/aws/resources/services/organizations/accounts.go @@ -44,7 +44,7 @@ The 'request_account_id' column is added to show from where the request was made func fetchOrganizationsAccounts(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations var input organizations.ListAccountsInput paginator := organizations.NewListAccountsPaginator(svc, &input) for paginator.HasMorePages() { @@ -65,7 +65,7 @@ func resolveAccountTags(ctx context.Context, meta schema.ClientMeta, resource *s input := organizations.ListTagsForResourceInput{ ResourceId: account.Id, } - paginator := organizations.NewListTagsForResourcePaginator(cl.Services().Organizations, &input) + paginator := organizations.NewListTagsForResourcePaginator(cl.Services(client.AWSServiceOrganizations).Organizations, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *organizations.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/organizations/delegated_admins.go b/plugins/source/aws/resources/services/organizations/delegated_admins.go index cfa003f179030c..0478f8a9175906 100644 --- a/plugins/source/aws/resources/services/organizations/delegated_admins.go +++ b/plugins/source/aws/resources/services/organizations/delegated_admins.go @@ -25,7 +25,7 @@ func DelegatedAdministrators() *schema.Table { } func fetchOrganizationsDelegatedAdmins(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations var input organizations.ListDelegatedAdministratorsInput paginator := organizations.NewListDelegatedAdministratorsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/organizations/delegated_services.go b/plugins/source/aws/resources/services/organizations/delegated_services.go index e047452fbced00..e0ad1e0d186a58 100644 --- a/plugins/source/aws/resources/services/organizations/delegated_services.go +++ b/plugins/source/aws/resources/services/organizations/delegated_services.go @@ -24,7 +24,7 @@ func delegatedServices() *schema.Table { } func fetchOrganizationsDelegatedServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations paginator := organizations.NewListDelegatedServicesForAccountPaginator(svc, &organizations.ListDelegatedServicesForAccountInput{ AccountId: parent.Item.(types.Account).Id, }) diff --git a/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go b/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go index 85347fa8a54630..e1958afd107a5e 100644 --- a/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go +++ b/plugins/source/aws/resources/services/organizations/organizational_unit_parents.go @@ -43,7 +43,7 @@ The 'request_account_id' column is added to show from where the request was made } func fetchOUParents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations resp, err := svc.ListParents(ctx, &organizations.ListParentsInput{ ChildId: parent.Item.(*types.OrganizationalUnit).Id, diff --git a/plugins/source/aws/resources/services/organizations/organizational_units.go b/plugins/source/aws/resources/services/organizations/organizational_units.go index 7adac70e824858..dbc030ad9ed4a4 100644 --- a/plugins/source/aws/resources/services/organizations/organizational_units.go +++ b/plugins/source/aws/resources/services/organizations/organizational_units.go @@ -42,7 +42,7 @@ The 'request_account_id' column is added to show from where the request was made func fetchOUs(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations var input organizations.ListRootsInput paginator := organizations.NewListRootsPaginator(svc, &input) var roots []types.Root @@ -101,7 +101,7 @@ func getOUs(ctx context.Context, meta schema.ClientMeta, accountsApi services.Or func getOU(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) child := resource.Item.(types.Child) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations ou, err := svc.DescribeOrganizationalUnit(ctx, &organizations.DescribeOrganizationalUnitInput{ OrganizationalUnitId: child.Id, }, func(options *organizations.Options) { diff --git a/plugins/source/aws/resources/services/organizations/organizations.go b/plugins/source/aws/resources/services/organizations/organizations.go index 67f8ad7160e2af..351ef5d1f5f26d 100644 --- a/plugins/source/aws/resources/services/organizations/organizations.go +++ b/plugins/source/aws/resources/services/organizations/organizations.go @@ -30,7 +30,7 @@ func Organizations() *schema.Table { func fetchOrganizationsOrganizations(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations o, err := svc.DescribeOrganization(ctx, &organizations.DescribeOrganizationInput{}, func(options *organizations.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/organizations/policies.go b/plugins/source/aws/resources/services/organizations/policies.go index 26273cb4c61052..7b7428cb9a36a7 100644 --- a/plugins/source/aws/resources/services/organizations/policies.go +++ b/plugins/source/aws/resources/services/organizations/policies.go @@ -34,7 +34,7 @@ func Policies() *schema.Table { func fetchOrganizationsPolicies(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations for _, policyType := range types.PolicyType("").Values() { paginator := organizations.NewListPoliciesPaginator(svc, &organizations.ListPoliciesInput{ Filter: policyType, @@ -56,7 +56,7 @@ func fetchOrganizationsPolicies(ctx context.Context, meta schema.ClientMeta, _ * func resolvePolicyContent(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.PolicySummary) cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations resp, err := svc.DescribePolicy(ctx, &organizations.DescribePolicyInput{ PolicyId: r.Id, }) diff --git a/plugins/source/aws/resources/services/organizations/resource_policies.go b/plugins/source/aws/resources/services/organizations/resource_policies.go index 42e78bc53e8ac1..4f5b012c2479ab 100644 --- a/plugins/source/aws/resources/services/organizations/resource_policies.go +++ b/plugins/source/aws/resources/services/organizations/resource_policies.go @@ -26,7 +26,7 @@ func ResourcePolicies() *schema.Table { func fetchOrganizationsResourcePolicies(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations o, err := svc.DescribeResourcePolicy(ctx, &organizations.DescribeResourcePolicyInput{}, func(options *organizations.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/organizations/roots.go b/plugins/source/aws/resources/services/organizations/roots.go index 3aa8440529c16d..84a243936424a8 100644 --- a/plugins/source/aws/resources/services/organizations/roots.go +++ b/plugins/source/aws/resources/services/organizations/roots.go @@ -39,7 +39,7 @@ The 'request_account_id' column is added to show from where the request was made } func fetchOrganizationsRoots(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Organizations + svc := cl.Services(client.AWSServiceOrganizations).Organizations var input organizations.ListRootsInput paginator := organizations.NewListRootsPaginator(svc, &input) for paginator.HasMorePages() { @@ -61,7 +61,7 @@ func resolveRootTags(ctx context.Context, meta schema.ClientMeta, resource *sche input := organizations.ListTagsForResourceInput{ ResourceId: root.Id, } - paginator := organizations.NewListTagsForResourcePaginator(cl.Services().Organizations, &input) + paginator := organizations.NewListTagsForResourcePaginator(cl.Services(client.AWSServiceOrganizations).Organizations, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *organizations.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go b/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go index ee8f8cec200d7a..25d004f091236f 100644 --- a/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go +++ b/plugins/source/aws/resources/services/qldb/ledger_journal_kinesis_streams.go @@ -34,7 +34,7 @@ func ledgerJournalKinesisStreams() *schema.Table { func fetchQldbLedgerJournalKinesisStreams(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { ledger := parent.Item.(*qldb.DescribeLedgerOutput) cl := meta.(*client.Client) - svc := cl.Services().Qldb + svc := cl.Services(client.AWSServiceQldb).Qldb config := &qldb.ListJournalKinesisStreamsForLedgerInput{ LedgerName: ledger.Name, MaxResults: aws.Int32(100), diff --git a/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go b/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go index 9e827bd369b851..7b57ace2720a9d 100644 --- a/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go +++ b/plugins/source/aws/resources/services/qldb/ledger_journal_s3_exports.go @@ -34,7 +34,7 @@ func ledgerJournalS3Exports() *schema.Table { func fetchQldbLedgerJournalS3Exports(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { ledger := parent.Item.(*qldb.DescribeLedgerOutput) cl := meta.(*client.Client) - svc := cl.Services().Qldb + svc := cl.Services(client.AWSServiceQldb).Qldb config := &qldb.ListJournalS3ExportsForLedgerInput{ Name: ledger.Name, MaxResults: aws.Int32(100), diff --git a/plugins/source/aws/resources/services/qldb/ledgers.go b/plugins/source/aws/resources/services/qldb/ledgers.go index 0c4b7e1d30dc8e..71f99d2da77030 100644 --- a/plugins/source/aws/resources/services/qldb/ledgers.go +++ b/plugins/source/aws/resources/services/qldb/ledgers.go @@ -47,7 +47,7 @@ func Ledgers() *schema.Table { func fetchQldbLedgers(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Qldb + svc := cl.Services(client.AWSServiceQldb).Qldb config := qldb.ListLedgersInput{} paginator := qldb.NewListLedgersPaginator(svc, &config) for paginator.HasMorePages() { @@ -64,7 +64,7 @@ func fetchQldbLedgers(ctx context.Context, meta schema.ClientMeta, _ *schema.Res func getLedger(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Qldb + svc := cl.Services(client.AWSServiceQldb).Qldb l := resource.Item.(types.LedgerSummary) response, err := svc.DescribeLedger(ctx, &qldb.DescribeLedgerInput{Name: l.Name}, func(options *qldb.Options) { @@ -81,7 +81,7 @@ func resolveQldbLedgerTags(ctx context.Context, meta schema.ClientMeta, resource ledger := resource.Item.(*qldb.DescribeLedgerOutput) cl := meta.(*client.Client) - svc := cl.Services().Qldb + svc := cl.Services(client.AWSServiceQldb).Qldb response, err := svc.ListTagsForResource(ctx, &qldb.ListTagsForResourceInput{ ResourceArn: ledger.Arn, }, func(options *qldb.Options) { diff --git a/plugins/source/aws/resources/services/quicksight/analyses.go b/plugins/source/aws/resources/services/quicksight/analyses.go index 4cf130ddb7a4cb..db7e07b8641ee5 100644 --- a/plugins/source/aws/resources/services/quicksight/analyses.go +++ b/plugins/source/aws/resources/services/quicksight/analyses.go @@ -28,7 +28,7 @@ func Analyses() *schema.Table { func fetchQuicksightAnalyses(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListAnalysesInput{ AwsAccountId: aws.String(cl.AccountID), } @@ -52,7 +52,7 @@ func fetchQuicksightAnalyses(ctx context.Context, meta schema.ClientMeta, parent func getAnalysis(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight item := resource.Item.(types.AnalysisSummary) out, err := svc.DescribeAnalysis(ctx, &quicksight.DescribeAnalysisInput{ diff --git a/plugins/source/aws/resources/services/quicksight/dashboards.go b/plugins/source/aws/resources/services/quicksight/dashboards.go index 0052b98b961061..ec0d287c32aad2 100644 --- a/plugins/source/aws/resources/services/quicksight/dashboards.go +++ b/plugins/source/aws/resources/services/quicksight/dashboards.go @@ -27,7 +27,7 @@ func Dashboards() *schema.Table { func fetchQuicksightDashboards(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListDashboardsInput{ AwsAccountId: aws.String(cl.AccountID), } diff --git a/plugins/source/aws/resources/services/quicksight/data_sets.go b/plugins/source/aws/resources/services/quicksight/data_sets.go index 43eac95bbdedf1..82aeebd4843a71 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sets.go +++ b/plugins/source/aws/resources/services/quicksight/data_sets.go @@ -28,7 +28,7 @@ func DataSets() *schema.Table { func fetchQuicksightDataSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListDataSetsInput{ AwsAccountId: aws.String(cl.AccountID), } diff --git a/plugins/source/aws/resources/services/quicksight/data_sources.go b/plugins/source/aws/resources/services/quicksight/data_sources.go index 208366e7c7bd92..f0ccca3ab19669 100644 --- a/plugins/source/aws/resources/services/quicksight/data_sources.go +++ b/plugins/source/aws/resources/services/quicksight/data_sources.go @@ -30,7 +30,7 @@ func DataSources() *schema.Table { func fetchQuicksightDataSources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListDataSourcesInput{ AwsAccountId: aws.String(cl.AccountID), } diff --git a/plugins/source/aws/resources/services/quicksight/folders.go b/plugins/source/aws/resources/services/quicksight/folders.go index d175d600945c9f..905a7b5258d023 100644 --- a/plugins/source/aws/resources/services/quicksight/folders.go +++ b/plugins/source/aws/resources/services/quicksight/folders.go @@ -28,7 +28,7 @@ func Folders() *schema.Table { func fetchQuicksightFolders(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListFoldersInput{ AwsAccountId: aws.String(cl.AccountID), } @@ -57,7 +57,7 @@ func fetchQuicksightFolders(ctx context.Context, meta schema.ClientMeta, parent func getFolder(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight item := resource.Item.(types.FolderSummary) out, err := svc.DescribeFolder(ctx, &quicksight.DescribeFolderInput{ diff --git a/plugins/source/aws/resources/services/quicksight/group_members.go b/plugins/source/aws/resources/services/quicksight/group_members.go index 27f4f6af590e5a..75493daa319cab 100644 --- a/plugins/source/aws/resources/services/quicksight/group_members.go +++ b/plugins/source/aws/resources/services/quicksight/group_members.go @@ -35,7 +35,7 @@ func groupMembers() *schema.Table { func fetchQuicksightGroupMembers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { item := parent.Item.(types.Group) cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListGroupMembershipsInput{ AwsAccountId: aws.String(cl.AccountID), diff --git a/plugins/source/aws/resources/services/quicksight/groups.go b/plugins/source/aws/resources/services/quicksight/groups.go index d0a667c3f090db..865b7e73576462 100644 --- a/plugins/source/aws/resources/services/quicksight/groups.go +++ b/plugins/source/aws/resources/services/quicksight/groups.go @@ -30,7 +30,7 @@ const defaultNamespace = "default" func fetchQuicksightGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListGroupsInput{ AwsAccountId: aws.String(cl.AccountID), Namespace: aws.String(defaultNamespace), diff --git a/plugins/source/aws/resources/services/quicksight/ingestions.go b/plugins/source/aws/resources/services/quicksight/ingestions.go index 30de6069cb4030..09d8086f96e896 100644 --- a/plugins/source/aws/resources/services/quicksight/ingestions.go +++ b/plugins/source/aws/resources/services/quicksight/ingestions.go @@ -36,7 +36,7 @@ func ingestions() *schema.Table { func fetchQuicksightIngestions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { item := parent.Item.(types.DataSetSummary) cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListIngestionsInput{ AwsAccountId: aws.String(cl.AccountID), DataSetId: item.DataSetId, diff --git a/plugins/source/aws/resources/services/quicksight/tag_fetch.go b/plugins/source/aws/resources/services/quicksight/tag_fetch.go index 705a7fa1dc1bed..ed1353ce1e02fd 100644 --- a/plugins/source/aws/resources/services/quicksight/tag_fetch.go +++ b/plugins/source/aws/resources/services/quicksight/tag_fetch.go @@ -20,7 +20,7 @@ var tagsCol = schema.Column{ func resolveTags(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { arn := funk.Get(r.Item, "Arn", funk.WithAllowZero()).(*string) cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight params := quicksight.ListTagsForResourceInput{ResourceArn: arn} output, err := svc.ListTagsForResource(ctx, ¶ms, func(options *quicksight.Options) { diff --git a/plugins/source/aws/resources/services/quicksight/templates.go b/plugins/source/aws/resources/services/quicksight/templates.go index 5da5ec4eabb159..fc73f9f297484c 100644 --- a/plugins/source/aws/resources/services/quicksight/templates.go +++ b/plugins/source/aws/resources/services/quicksight/templates.go @@ -27,7 +27,7 @@ func Templates() *schema.Table { func fetchQuicksightTemplates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListTemplatesInput{ AwsAccountId: aws.String(cl.AccountID), } diff --git a/plugins/source/aws/resources/services/quicksight/users.go b/plugins/source/aws/resources/services/quicksight/users.go index fdb688c108efdf..635711b7ccf3c2 100644 --- a/plugins/source/aws/resources/services/quicksight/users.go +++ b/plugins/source/aws/resources/services/quicksight/users.go @@ -27,7 +27,7 @@ func Users() *schema.Table { func fetchQuicksightUsers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Quicksight + svc := cl.Services(client.AWSServiceQuicksight).Quicksight input := quicksight.ListUsersInput{ AwsAccountId: aws.String(cl.AccountID), Namespace: aws.String(defaultNamespace), diff --git a/plugins/source/aws/resources/services/ram/principals.go b/plugins/source/aws/resources/services/ram/principals.go index 62a5f8978bb56a..33d1a16d92d95a 100644 --- a/plugins/source/aws/resources/services/ram/principals.go +++ b/plugins/source/aws/resources/services/ram/principals.go @@ -47,7 +47,7 @@ func fetchRamPrincipalsByOwner(ctx context.Context, meta schema.ClientMeta, shar MaxResults: aws.Int32(500), ResourceOwner: shareType, } - paginator := ram.NewListPrincipalsPaginator(meta.(*client.Client).Services().Ram, input) + paginator := ram.NewListPrincipalsPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ram/resource_share_associations.go b/plugins/source/aws/resources/services/ram/resource_share_associations.go index 91d9e0a72317f0..3617fd24a1ebeb 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_associations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_associations.go @@ -47,7 +47,7 @@ func fetchRamResourceShareAssociations(ctx context.Context, meta schema.ClientMe func fetchRamResourceShareAssociationsByType(ctx context.Context, meta schema.ClientMeta, resourceShareInput *ram.GetResourceShareAssociationsInput, res chan<- any) error { cl := meta.(*client.Client) - paginator := ram.NewGetResourceShareAssociationsPaginator(meta.(*client.Client).Services().Ram, resourceShareInput) + paginator := ram.NewGetResourceShareAssociationsPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, resourceShareInput) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ram/resource_share_invitations.go b/plugins/source/aws/resources/services/ram/resource_share_invitations.go index b7545e699ff38a..db8cf740cc64af 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_invitations.go +++ b/plugins/source/aws/resources/services/ram/resource_share_invitations.go @@ -42,7 +42,7 @@ func ResourceShareInvitations() *schema.Table { func fetchRamResourceShareInvitations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var input ram.GetResourceShareInvitationsInput = getResourceShareInvitationsInput() cl := meta.(*client.Client) - svc := cl.Services().Ram + svc := cl.Services(client.AWSServiceRam).Ram paginator := ram.NewGetResourceShareInvitationsPaginator(svc, &input) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *ram.Options) { diff --git a/plugins/source/aws/resources/services/ram/resource_share_permissions.go b/plugins/source/aws/resources/services/ram/resource_share_permissions.go index 073ca9cedc21c9..c02c0a633b88b5 100644 --- a/plugins/source/aws/resources/services/ram/resource_share_permissions.go +++ b/plugins/source/aws/resources/services/ram/resource_share_permissions.go @@ -50,7 +50,7 @@ func fetchRamResourceSharePermissions(ctx context.Context, meta schema.ClientMet MaxResults: aws.Int32(500), ResourceShareArn: resource.Item.(types.ResourceShare).ResourceShareArn, } - paginator := ram.NewListResourceSharePermissionsPaginator(meta.(*client.Client).Services().Ram, input) + paginator := ram.NewListResourceSharePermissionsPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region @@ -65,7 +65,7 @@ func fetchRamResourceSharePermissions(ctx context.Context, meta schema.ClientMet func resolveResourceSharePermissionDetailPermission(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Ram + svc := cl.Services(client.AWSServiceRam).Ram permission := resource.Item.(types.ResourceSharePermissionSummary) version, err := strconv.ParseInt(aws.ToString(permission.Version), 10, 32) if err != nil { diff --git a/plugins/source/aws/resources/services/ram/resource_shares.go b/plugins/source/aws/resources/services/ram/resource_shares.go index 19cab048bc35f0..e0e8ba6b61fbb8 100644 --- a/plugins/source/aws/resources/services/ram/resource_shares.go +++ b/plugins/source/aws/resources/services/ram/resource_shares.go @@ -62,7 +62,7 @@ func fetchRamResourceSharesByType(ctx context.Context, meta schema.ClientMeta, s MaxResults: aws.Int32(500), ResourceOwner: shareType, } - paginator := ram.NewGetResourceSharesPaginator(meta.(*client.Client).Services().Ram, input) + paginator := ram.NewGetResourceSharesPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ram/resource_types.go b/plugins/source/aws/resources/services/ram/resource_types.go index b5e6a0a73529a6..efafbfafba49ce 100644 --- a/plugins/source/aws/resources/services/ram/resource_types.go +++ b/plugins/source/aws/resources/services/ram/resource_types.go @@ -41,7 +41,7 @@ func ResourceTypes() *schema.Table { func fetchRamResourceTypes(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) input := &ram.ListResourceTypesInput{MaxResults: aws.Int32(500)} - paginator := ram.NewListResourceTypesPaginator(meta.(*client.Client).Services().Ram, input) + paginator := ram.NewListResourceTypesPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ram/resources.go b/plugins/source/aws/resources/services/ram/resources.go index 271a8efc9486ec..a48d27463f505a 100644 --- a/plugins/source/aws/resources/services/ram/resources.go +++ b/plugins/source/aws/resources/services/ram/resources.go @@ -44,7 +44,7 @@ func fetchRamResourcesByOwner(ctx context.Context, meta schema.ClientMeta, share MaxResults: aws.Int32(500), ResourceOwner: shareType, } - paginator := ram.NewListResourcesPaginator(meta.(*client.Client).Services().Ram, input) + paginator := ram.NewListResourcesPaginator(meta.(*client.Client).Services(client.AWSServiceRam).Ram, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(options *ram.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/rds/certificates.go b/plugins/source/aws/resources/services/rds/certificates.go index 3c1f3528453ff3..df228df67da50c 100644 --- a/plugins/source/aws/resources/services/rds/certificates.go +++ b/plugins/source/aws/resources/services/rds/certificates.go @@ -35,7 +35,7 @@ func Certificates() *schema.Table { func fetchRdsCertificates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config rds.DescribeCertificatesInput cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds paginator := rds.NewDescribeCertificatesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *rds.Options) { diff --git a/plugins/source/aws/resources/services/rds/cluster_backtracks.go b/plugins/source/aws/resources/services/rds/cluster_backtracks.go index eebcf30af7b813..7857033fe07112 100644 --- a/plugins/source/aws/resources/services/rds/cluster_backtracks.go +++ b/plugins/source/aws/resources/services/rds/cluster_backtracks.go @@ -46,7 +46,7 @@ func fetchRdsClusterBacktracks(ctx context.Context, meta schema.ClientMeta, pare DBClusterIdentifier: cluster.DBClusterIdentifier, } cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds p := rds.NewDescribeDBClusterBacktracksPaginator(svc, &config) for p.HasMorePages() { resp, err := p.NextPage(ctx, func(options *rds.Options) { diff --git a/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go b/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go index 20f57382786014..645475413e9a47 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameter_group_parameters.go @@ -32,7 +32,7 @@ func clusterParameterGroupParameters() *schema.Table { func fetchRdsClusterParameterGroupParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds g := parent.Item.(types.DBClusterParameterGroup) input := rds.DescribeDBClusterParametersInput{DBClusterParameterGroupName: g.DBClusterParameterGroupName} paginator := rds.NewDescribeDBClusterParametersPaginator(svc, &input) diff --git a/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go b/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go index a75b8411762e81..d875c729a5f86f 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameter_groups.go @@ -45,7 +45,7 @@ func ClusterParameterGroups() *schema.Table { func fetchRdsClusterParameterGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeDBClusterParameterGroupsInput paginator := rds.NewDescribeDBClusterParameterGroupsPaginator(svc, &input) for paginator.HasMorePages() { @@ -63,7 +63,7 @@ func fetchRdsClusterParameterGroups(ctx context.Context, meta schema.ClientMeta, func resolveRdsClusterParameterGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBClusterParameterGroup) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: g.DBClusterParameterGroupArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/cluster_parameters.go b/plugins/source/aws/resources/services/rds/cluster_parameters.go index 3da373c746b8eb..95fc176b3c6f99 100644 --- a/plugins/source/aws/resources/services/rds/cluster_parameters.go +++ b/plugins/source/aws/resources/services/rds/cluster_parameters.go @@ -84,7 +84,7 @@ func clusterParameters() *schema.Table { func fetchRdsClusterParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds parentEngineVersion := parent.Item.(types.DBEngineVersion) diff --git a/plugins/source/aws/resources/services/rds/cluster_snapshots.go b/plugins/source/aws/resources/services/rds/cluster_snapshots.go index 13c5dfafe4aa5c..5a3967f4b3b649 100644 --- a/plugins/source/aws/resources/services/rds/cluster_snapshots.go +++ b/plugins/source/aws/resources/services/rds/cluster_snapshots.go @@ -46,7 +46,7 @@ func ClusterSnapshots() *schema.Table { func fetchRdsClusterSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeDBClusterSnapshotsInput paginator := rds.NewDescribeDBClusterSnapshotsPaginator(svc, &input) for paginator.HasMorePages() { @@ -69,7 +69,7 @@ func resolveRDSClusterSnapshotTags(ctx context.Context, meta schema.ClientMeta, func resolveRDSClusterSnapshotAttributes(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, column schema.Column) error { s := resource.Item.(types.DBClusterSnapshot) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.DescribeDBClusterSnapshotAttributes( ctx, &rds.DescribeDBClusterSnapshotAttributesInput{DBClusterSnapshotIdentifier: s.DBClusterSnapshotIdentifier}, diff --git a/plugins/source/aws/resources/services/rds/clusters.go b/plugins/source/aws/resources/services/rds/clusters.go index 0529f0e80f3329..13b9acdf4f33b0 100644 --- a/plugins/source/aws/resources/services/rds/clusters.go +++ b/plugins/source/aws/resources/services/rds/clusters.go @@ -45,7 +45,7 @@ func Clusters() *schema.Table { func fetchRdsClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config rds.DescribeDBClustersInput cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds paginator := rds.NewDescribeDBClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *rds.Options) { diff --git a/plugins/source/aws/resources/services/rds/db_parameter_groups.go b/plugins/source/aws/resources/services/rds/db_parameter_groups.go index ef266c12852586..f5a76b987c739d 100644 --- a/plugins/source/aws/resources/services/rds/db_parameter_groups.go +++ b/plugins/source/aws/resources/services/rds/db_parameter_groups.go @@ -45,7 +45,7 @@ func DbParameterGroups() *schema.Table { func fetchRdsDbParameterGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeDBParameterGroupsInput paginator := rds.NewDescribeDBParameterGroupsPaginator(svc, &input) for paginator.HasMorePages() { @@ -62,7 +62,7 @@ func fetchRdsDbParameterGroups(ctx context.Context, meta schema.ClientMeta, pare func fetchRdsDbParameterGroupDbParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds g := parent.Item.(types.DBParameterGroup) input := rds.DescribeDBParametersInput{DBParameterGroupName: g.DBParameterGroupName} paginator := rds.NewDescribeDBParametersPaginator(svc, &input) @@ -85,7 +85,7 @@ func fetchRdsDbParameterGroupDbParameters(ctx context.Context, meta schema.Clien func resolveRdsDbParameterGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBParameterGroup) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: g.DBParameterGroupArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/db_proxies.go b/plugins/source/aws/resources/services/rds/db_proxies.go index c86be50205a56a..1e3950346fa144 100644 --- a/plugins/source/aws/resources/services/rds/db_proxies.go +++ b/plugins/source/aws/resources/services/rds/db_proxies.go @@ -41,7 +41,7 @@ func DbProxies() *schema.Table { func fetchDbProxies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds input := rds.DescribeDBProxiesInput{} paginator := rds.NewDescribeDBProxiesPaginator(svc, &input) for paginator.HasMorePages() { @@ -59,7 +59,7 @@ func fetchDbProxies(ctx context.Context, meta schema.ClientMeta, parent *schema. func resolveRdsDbProxyTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBProxy) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: g.DBProxyArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/db_security_groups.go b/plugins/source/aws/resources/services/rds/db_security_groups.go index 652dff74058930..b70a0280567ea5 100644 --- a/plugins/source/aws/resources/services/rds/db_security_groups.go +++ b/plugins/source/aws/resources/services/rds/db_security_groups.go @@ -44,7 +44,7 @@ func DbSecurityGroups() *schema.Table { func fetchRdsDbSecurityGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeDBSecurityGroupsInput paginator := rds.NewDescribeDBSecurityGroupsPaginator(svc, &input) for paginator.HasMorePages() { @@ -62,7 +62,7 @@ func fetchRdsDbSecurityGroups(ctx context.Context, meta schema.ClientMeta, paren func resolveRdsDbSecurityGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { g := resource.Item.(types.DBSecurityGroup) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: g.DBSecurityGroupArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/db_snapshots.go b/plugins/source/aws/resources/services/rds/db_snapshots.go index cde457a37dafcd..a86e4d457bc4f1 100644 --- a/plugins/source/aws/resources/services/rds/db_snapshots.go +++ b/plugins/source/aws/resources/services/rds/db_snapshots.go @@ -46,7 +46,7 @@ func DbSnapshots() *schema.Table { func fetchRdsDbSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeDBSnapshotsInput paginator := rds.NewDescribeDBSnapshotsPaginator(svc, &input) for paginator.HasMorePages() { @@ -73,7 +73,7 @@ func resolveRDSDBSnapshotTags(ctx context.Context, meta schema.ClientMeta, resou func resolveRDSDBSnapshotAttributes(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, column schema.Column) error { s := resource.Item.(types.DBSnapshot) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.DescribeDBSnapshotAttributes( ctx, &rds.DescribeDBSnapshotAttributesInput{DBSnapshotIdentifier: s.DBSnapshotIdentifier}, diff --git a/plugins/source/aws/resources/services/rds/engine_versions.go b/plugins/source/aws/resources/services/rds/engine_versions.go index 3e793b759e0d82..cec5e5e5e430c5 100644 --- a/plugins/source/aws/resources/services/rds/engine_versions.go +++ b/plugins/source/aws/resources/services/rds/engine_versions.go @@ -45,7 +45,7 @@ func EngineVersions() *schema.Table { func fetchRdsEngineVersions(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds input := &rds.DescribeDBEngineVersionsInput{} p := rds.NewDescribeDBEngineVersionsPaginator(svc, input) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/rds/event_subscriptions.go b/plugins/source/aws/resources/services/rds/event_subscriptions.go index 96fbfea2cc0381..2054715c9096de 100644 --- a/plugins/source/aws/resources/services/rds/event_subscriptions.go +++ b/plugins/source/aws/resources/services/rds/event_subscriptions.go @@ -41,7 +41,7 @@ func EventSubscriptions() *schema.Table { func fetchRdsEventSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds var input rds.DescribeEventSubscriptionsInput paginator := rds.NewDescribeEventSubscriptionsPaginator(svc, &input) for paginator.HasMorePages() { @@ -59,7 +59,7 @@ func fetchRdsEventSubscriptions(ctx context.Context, meta schema.ClientMeta, par func resolveRDSEventSubscriptionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { s := resource.Item.(types.EventSubscription) cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: s.EventSubscriptionArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/events.go b/plugins/source/aws/resources/services/rds/events.go index e468a09e7a09ad..06fde600a89ba3 100644 --- a/plugins/source/aws/resources/services/rds/events.go +++ b/plugins/source/aws/resources/services/rds/events.go @@ -27,7 +27,7 @@ func Events() *schema.Table { func fetchRdsEvents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds duration := int32(60 * 24 * 14) // 14 days (maximum) config := rds.DescribeEventsInput{ Duration: &duration, diff --git a/plugins/source/aws/resources/services/rds/instances.go b/plugins/source/aws/resources/services/rds/instances.go index 62200a871675b1..f4d41324a91f92 100644 --- a/plugins/source/aws/resources/services/rds/instances.go +++ b/plugins/source/aws/resources/services/rds/instances.go @@ -47,7 +47,7 @@ func Instances() *schema.Table { func fetchRdsInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config rds.DescribeDBInstancesInput cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds paginator := rds.NewDescribeDBInstancesPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *rds.Options) { diff --git a/plugins/source/aws/resources/services/rds/option_groups.go b/plugins/source/aws/resources/services/rds/option_groups.go index dd2a1ecfaa8d3a..cc9fd95fe987c4 100644 --- a/plugins/source/aws/resources/services/rds/option_groups.go +++ b/plugins/source/aws/resources/services/rds/option_groups.go @@ -34,7 +34,7 @@ func OptionGroups() *schema.Table { func fetchOptionGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds config := rds.DescribeOptionGroupsInput{} p := rds.NewDescribeOptionGroupsPaginator(svc, &config) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/rds/reserved_instances.go b/plugins/source/aws/resources/services/rds/reserved_instances.go index c298eda5df20d1..889b4c0e323ba6 100644 --- a/plugins/source/aws/resources/services/rds/reserved_instances.go +++ b/plugins/source/aws/resources/services/rds/reserved_instances.go @@ -42,7 +42,7 @@ func ReservedInstances() *schema.Table { func fetchRdsReservedInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config rds.DescribeReservedDBInstancesInput cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds paginator := rds.NewDescribeReservedDBInstancesPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(options *rds.Options) { @@ -58,7 +58,7 @@ func fetchRdsReservedInstances(ctx context.Context, meta schema.ClientMeta, pare func resolveRdsRITags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds out, err := svc.ListTagsForResource(ctx, &rds.ListTagsForResourceInput{ResourceName: resource.Item.(types.ReservedDBInstance).ReservedDBInstanceArn}, func(options *rds.Options) { options.Region = cl.Region }) diff --git a/plugins/source/aws/resources/services/rds/subnet_groups.go b/plugins/source/aws/resources/services/rds/subnet_groups.go index f76f94cbccb1fd..ed8160f87df597 100644 --- a/plugins/source/aws/resources/services/rds/subnet_groups.go +++ b/plugins/source/aws/resources/services/rds/subnet_groups.go @@ -34,7 +34,7 @@ func SubnetGroups() *schema.Table { func fetchRdsSubnetGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Rds + svc := cl.Services(client.AWSServiceRds).Rds paginator := rds.NewDescribeDBSubnetGroupsPaginator(svc, &rds.DescribeDBSubnetGroupsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *rds.Options) { diff --git a/plugins/source/aws/resources/services/redshift/cluster_parameters.go b/plugins/source/aws/resources/services/redshift/cluster_parameters.go index f45874f02a5786..5e3950c14d6f5e 100644 --- a/plugins/source/aws/resources/services/redshift/cluster_parameters.go +++ b/plugins/source/aws/resources/services/redshift/cluster_parameters.go @@ -41,7 +41,7 @@ func clusterParameters() *schema.Table { func fetchClusterParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { group := parent.Item.(types.ClusterParameterGroupStatus) cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift config := redshift.DescribeClusterParametersInput{ ParameterGroupName: group.ParameterGroupName, diff --git a/plugins/source/aws/resources/services/redshift/clusters.go b/plugins/source/aws/resources/services/redshift/clusters.go index 145aa79c0f58fb..f6b04c4299680c 100644 --- a/plugins/source/aws/resources/services/redshift/clusters.go +++ b/plugins/source/aws/resources/services/redshift/clusters.go @@ -57,7 +57,7 @@ func Clusters() *schema.Table { func fetchClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config redshift.DescribeClustersInput cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift paginator := redshift.NewDescribeClustersPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *redshift.Options) { @@ -75,7 +75,7 @@ func resolveRedshiftClusterLoggingStatus(ctx context.Context, meta schema.Client r := resource.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift cfg := redshift.DescribeLoggingStatusInput{ ClusterIdentifier: r.ClusterIdentifier, } diff --git a/plugins/source/aws/resources/services/redshift/data_shares.go b/plugins/source/aws/resources/services/redshift/data_shares.go index 20e9e9da9c6b07..e2c9c904587df3 100644 --- a/plugins/source/aws/resources/services/redshift/data_shares.go +++ b/plugins/source/aws/resources/services/redshift/data_shares.go @@ -28,7 +28,7 @@ func DataShares() *schema.Table { func fetchDataShares(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift config := redshift.DescribeDataSharesInput{ MaxRecords: aws.Int32(100), diff --git a/plugins/source/aws/resources/services/redshift/endpoint_access.go b/plugins/source/aws/resources/services/redshift/endpoint_access.go index 6251291f07f98e..5fb8630a185396 100644 --- a/plugins/source/aws/resources/services/redshift/endpoint_access.go +++ b/plugins/source/aws/resources/services/redshift/endpoint_access.go @@ -35,7 +35,7 @@ func endpointAccess() *schema.Table { func fetchEndpointAccess(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cluster := parent.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift config := redshift.DescribeEndpointAccessInput{ ClusterIdentifier: cluster.ClusterIdentifier, diff --git a/plugins/source/aws/resources/services/redshift/endpoint_authorization.go b/plugins/source/aws/resources/services/redshift/endpoint_authorization.go index 43ff20aad80682..49113cf51e37fa 100644 --- a/plugins/source/aws/resources/services/redshift/endpoint_authorization.go +++ b/plugins/source/aws/resources/services/redshift/endpoint_authorization.go @@ -35,7 +35,7 @@ func endpointAuthorization() *schema.Table { func fetchEndpointAuthorization(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cluster := parent.Item.(types.Cluster) cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift config := redshift.DescribeEndpointAuthorizationInput{ Account: &cl.AccountID, diff --git a/plugins/source/aws/resources/services/redshift/event_subscriptions.go b/plugins/source/aws/resources/services/redshift/event_subscriptions.go index cee5597edee69c..ab705761908ed2 100644 --- a/plugins/source/aws/resources/services/redshift/event_subscriptions.go +++ b/plugins/source/aws/resources/services/redshift/event_subscriptions.go @@ -45,7 +45,7 @@ func EventSubscriptions() *schema.Table { func fetchEventSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift var params redshift.DescribeEventSubscriptionsInput params.MaxRecords = aws.Int32(100) paginator := redshift.NewDescribeEventSubscriptionsPaginator(svc, ¶ms) diff --git a/plugins/source/aws/resources/services/redshift/events.go b/plugins/source/aws/resources/services/redshift/events.go index 22d28bd1073516..aa96ee679a6b18 100644 --- a/plugins/source/aws/resources/services/redshift/events.go +++ b/plugins/source/aws/resources/services/redshift/events.go @@ -30,7 +30,7 @@ Only events occurred in the last 14 days are returned.`, func fetchEvents(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift config := redshift.DescribeEventsInput{ Duration: aws.Int32(60 * 24 * 14), // 14 days (maximum) diff --git a/plugins/source/aws/resources/services/redshift/snapshots.go b/plugins/source/aws/resources/services/redshift/snapshots.go index 9c965df819ccf6..70e38427cc6eb6 100644 --- a/plugins/source/aws/resources/services/redshift/snapshots.go +++ b/plugins/source/aws/resources/services/redshift/snapshots.go @@ -45,7 +45,7 @@ func snapshots() *schema.Table { func fetchSnapshots(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift cluster := parent.Item.(types.Cluster) params := redshift.DescribeClusterSnapshotsInput{ ClusterExists: aws.Bool(true), diff --git a/plugins/source/aws/resources/services/redshift/subnet_groups.go b/plugins/source/aws/resources/services/redshift/subnet_groups.go index 640bfec4e802f2..e2bd498f25c1ff 100644 --- a/plugins/source/aws/resources/services/redshift/subnet_groups.go +++ b/plugins/source/aws/resources/services/redshift/subnet_groups.go @@ -44,7 +44,7 @@ func SubnetGroups() *schema.Table { func fetchSubnetGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config redshift.DescribeClusterSubnetGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Redshift + svc := cl.Services(client.AWSServiceRedshift).Redshift paginator := redshift.NewDescribeClusterSubnetGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *redshift.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go index 98bc4727372a75..a43dd39fe30303 100644 --- a/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/alarm_recommendations.go @@ -23,7 +23,7 @@ func alarmRecommendations() *schema.Table { func fetchAlarmRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAlarmRecommendationsPaginator(svc, &resiliencehub.ListAlarmRecommendationsInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/app_assessments.go b/plugins/source/aws/resources/services/resiliencehub/app_assessments.go index 24f360768c1efa..55bbc50a18599a 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_assessments.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_assessments.go @@ -32,7 +32,7 @@ func appAssesments() *schema.Table { func describeAppAssessments(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub out, err := svc.DescribeAppAssessment(ctx, &resiliencehub.DescribeAppAssessmentInput{AssessmentArn: resource.Item.(types.AppAssessmentSummary).AssessmentArn}, func(options *resiliencehub.Options) { @@ -48,7 +48,7 @@ func describeAppAssessments(ctx context.Context, meta schema.ClientMeta, resourc func fetchAppAssessments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppAssessmentsPaginator(svc, &resiliencehub.ListAppAssessmentsInput{AppArn: parent.Item.(*types.App).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go b/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go index 700fd21556b3e9..e07fd42a2f8eca 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_component_compliances.go @@ -23,7 +23,7 @@ func appComponentCompliances() *schema.Table { func fetchAppComponentCompliances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppComponentCompliancesPaginator(svc, &resiliencehub.ListAppComponentCompliancesInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go index cbb8d3bf490c28..15cf2aca9c503e 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_version_resource_mappings.go @@ -32,7 +32,7 @@ func appVersionResourceMappings() *schema.Table { func fetchAppVersionResourceMappings(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppVersionResourceMappingsPaginator(svc, &resiliencehub.ListAppVersionResourceMappingsInput{ AppArn: parent.Parent.Item.(*types.App).AppArn, AppVersion: parent.Item.(types.AppVersionSummary).AppVersion, diff --git a/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go b/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go index 055d000052b4f1..fc469749d08ea6 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_version_resources.go @@ -33,7 +33,7 @@ func appVersionResources() *schema.Table { func fetchAppVersionResources(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppVersionResourcesPaginator(svc, &resiliencehub.ListAppVersionResourcesInput{ AppArn: parent.Parent.Item.(*types.App).AppArn, AppVersion: parent.Item.(types.AppVersionSummary).AppVersion, diff --git a/plugins/source/aws/resources/services/resiliencehub/app_versions.go b/plugins/source/aws/resources/services/resiliencehub/app_versions.go index 06c94f8a0f23d0..915f4d9bd45a37 100644 --- a/plugins/source/aws/resources/services/resiliencehub/app_versions.go +++ b/plugins/source/aws/resources/services/resiliencehub/app_versions.go @@ -24,7 +24,7 @@ func appVersions() *schema.Table { func fetchAppVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppVersionsPaginator(svc, &resiliencehub.ListAppVersionsInput{AppArn: parent.Item.(*types.App).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/apps.go b/plugins/source/aws/resources/services/resiliencehub/apps.go index fda03c01001ba0..ff68a506b15ff8 100644 --- a/plugins/source/aws/resources/services/resiliencehub/apps.go +++ b/plugins/source/aws/resources/services/resiliencehub/apps.go @@ -26,7 +26,7 @@ func Apps() *schema.Table { func fetchApps(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppsPaginator(svc, &resiliencehub.ListAppsInput{}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { @@ -43,7 +43,7 @@ func fetchApps(ctx context.Context, meta schema.ClientMeta, parent *schema.Resou func describeApp(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub out, err := svc.DescribeApp(ctx, &resiliencehub.DescribeAppInput{AppArn: resource.Item.(types.AppSummary).AppArn}, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go index d482c0c42e6bc3..d87e69d3233e1a 100644 --- a/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/component_recommendations.go @@ -23,7 +23,7 @@ func appComponentRecommendations() *schema.Table { func fetchComponentRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListAppComponentRecommendationsPaginator(svc, &resiliencehub.ListAppComponentRecommendationsInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go b/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go index 25b6f48f43cf60..d1bac95732d8a9 100644 --- a/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go +++ b/plugins/source/aws/resources/services/resiliencehub/recommendation_templates.go @@ -23,7 +23,7 @@ func recommendationTemplates() *schema.Table { func fetchRecommendationTemplates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListRecommendationTemplatesPaginator(svc, &resiliencehub.ListRecommendationTemplatesInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go b/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go index 38c60ba65943bf..8da06cfecb6791 100644 --- a/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go +++ b/plugins/source/aws/resources/services/resiliencehub/resiliency_policies.go @@ -24,7 +24,7 @@ func ResiliencyPolicies() *schema.Table { func fetchResiliencyPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListResiliencyPoliciesPaginator(svc, &resiliencehub.ListResiliencyPoliciesInput{}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go index 4d2fb3b25e8b08..907e88c59ca070 100644 --- a/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/sop_recommendations.go @@ -23,7 +23,7 @@ func sopRecommendations() *schema.Table { func fetchSopRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListSopRecommendationsPaginator(svc, &resiliencehub.ListSopRecommendationsInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go b/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go index 5b3dc00fe8813e..1b5a29df491bed 100644 --- a/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go +++ b/plugins/source/aws/resources/services/resiliencehub/suggested_resiliency_policies.go @@ -24,7 +24,7 @@ func SuggestedResiliencyPolicies() *schema.Table { func fetchSuggestedResiliencyPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListSuggestedResiliencyPoliciesPaginator(svc, &resiliencehub.ListSuggestedResiliencyPoliciesInput{}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go b/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go index 9222052f59a3b6..4a9bdb763ac429 100644 --- a/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go +++ b/plugins/source/aws/resources/services/resiliencehub/test_recommendations.go @@ -23,7 +23,7 @@ func testRecommendations() *schema.Table { func fetchTestRecommendations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Resiliencehub + svc := cl.Services(client.AWSServiceResiliencehub).Resiliencehub p := resiliencehub.NewListTestRecommendationsPaginator(svc, &resiliencehub.ListTestRecommendationsInput{AssessmentArn: parent.Item.(*types.AppAssessment).AppArn}) for p.HasMorePages() { out, err := p.NextPage(ctx, func(options *resiliencehub.Options) { diff --git a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go index 487d15c5a6a062..74c529c77781ed 100644 --- a/plugins/source/aws/resources/services/resourcegroups/resource_groups.go +++ b/plugins/source/aws/resources/services/resourcegroups/resource_groups.go @@ -43,7 +43,7 @@ func ResourceGroups() *schema.Table { func fetchResourcegroupsResourceGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config resourcegroups.ListGroupsInput cl := meta.(*client.Client) - svc := cl.Services().Resourcegroups + svc := cl.Services(client.AWSServiceResourcegroups).Resourcegroups paginator := resourcegroups.NewListGroupsPaginator(svc, &config) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(options *resourcegroups.Options) { @@ -60,7 +60,7 @@ func fetchResourcegroupsResourceGroups(ctx context.Context, meta schema.ClientMe func getResourceGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) group := resource.Item.(types.GroupIdentifier) - svc := cl.Services().Resourcegroups + svc := cl.Services(client.AWSServiceResourcegroups).Resourcegroups groupResponse, err := svc.GetGroup(ctx, &resourcegroups.GetGroupInput{ Group: group.GroupArn, }, func(options *resourcegroups.Options) { @@ -88,7 +88,7 @@ func getResourceGroup(ctx context.Context, meta schema.ClientMeta, resource *sch func resolveResourcegroupsResourceGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Resourcegroups + svc := cl.Services(client.AWSServiceResourcegroups).Resourcegroups group := resource.Item.(models.ResourceGroupWrapper) input := resourcegroups.GetTagsInput{ Arn: group.GroupArn, diff --git a/plugins/source/aws/resources/services/route53/delegation_sets.go b/plugins/source/aws/resources/services/route53/delegation_sets.go index 61562aacb0adaa..97ce369dc367e6 100644 --- a/plugins/source/aws/resources/services/route53/delegation_sets.go +++ b/plugins/source/aws/resources/services/route53/delegation_sets.go @@ -36,7 +36,7 @@ func DelegationSets() *schema.Table { func fetchRoute53DelegationSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config route53.ListReusableDelegationSetsInput cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 // no paginator available for { response, err := svc.ListReusableDelegationSets(ctx, &config, func(options *route53.Options) { diff --git a/plugins/source/aws/resources/services/route53/domains.go b/plugins/source/aws/resources/services/route53/domains.go index bd5695488e3d87..1787e8c1c916a3 100644 --- a/plugins/source/aws/resources/services/route53/domains.go +++ b/plugins/source/aws/resources/services/route53/domains.go @@ -46,7 +46,7 @@ func Domains() *schema.Table { func fetchRoute53Domains(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53domains + svc := cl.Services(client.AWSServiceRoute53domains).Route53domains var input route53domains.ListDomainsInput paginator := route53domains.NewListDomainsPaginator(svc, &input) for paginator.HasMorePages() { @@ -62,7 +62,7 @@ func fetchRoute53Domains(ctx context.Context, meta schema.ClientMeta, parent *sc } func getDomain(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Route53domains + svc := cl.Services(client.AWSServiceRoute53domains).Route53domains v := resource.Item.(types.DomainSummary) d, err := svc.GetDomainDetail(ctx, &route53domains.GetDomainDetailInput{DomainName: v.DomainName}, func(options *route53domains.Options) { @@ -79,7 +79,7 @@ func getDomain(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func resolveRoute53DomainTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Route53domains + svc := cl.Services(client.AWSServiceRoute53domains).Route53domains d := resource.Item.(*route53domains.GetDomainDetailOutput) out, err := svc.ListTagsForDomain(ctx, &route53domains.ListTagsForDomainInput{DomainName: d.DomainName}, func(options *route53domains.Options) { options.Region = cl.Region diff --git a/plugins/source/aws/resources/services/route53/health_checks.go b/plugins/source/aws/resources/services/route53/health_checks.go index 84ab7c10c3c56b..9a41d335257c59 100644 --- a/plugins/source/aws/resources/services/route53/health_checks.go +++ b/plugins/source/aws/resources/services/route53/health_checks.go @@ -51,7 +51,7 @@ type Route53HealthCheckWrapper struct { func fetchRoute53HealthChecks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config route53.ListHealthChecksInput cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 processHealthChecksBundle := func(healthChecks []types.HealthCheck) error { tagsCfg := &route53.ListTagsForResourcesInput{ResourceType: types.TagResourceTypeHealthcheck, ResourceIds: make([]string, 0, len(healthChecks))} diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go b/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go index 3a38e6b66a94e7..baaa6286330925 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_query_logging_configs.go @@ -42,7 +42,7 @@ func hostedZoneQueryLoggingConfigs() *schema.Table { func fetchRoute53HostedZoneQueryLoggingConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.Route53HostedZoneWrapper) cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 config := route53.ListQueryLoggingConfigsInput{HostedZoneId: r.Id} paginator := route53.NewListQueryLoggingConfigsPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go b/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go index 48fb47f09fe8cf..803fb1fc75f641 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_resource_record_sets.go @@ -33,7 +33,7 @@ func hostedZoneResourceRecordSets() *schema.Table { func fetchRoute53HostedZoneResourceRecordSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.Route53HostedZoneWrapper) cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 config := route53.ListResourceRecordSetsInput{HostedZoneId: r.Id} for { response, err := svc.ListResourceRecordSets(ctx, &config, func(options *route53.Options) {}, func(options *route53.Options) { diff --git a/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go b/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go index d528fa52988873..d4f5d31dbb1010 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go +++ b/plugins/source/aws/resources/services/route53/hosted_zone_traffic_policy_instances.go @@ -44,7 +44,7 @@ func fetchRoute53HostedZoneTrafficPolicyInstances(ctx context.Context, meta sche r := parent.Item.(*models.Route53HostedZoneWrapper) config := route53.ListTrafficPolicyInstancesByHostedZoneInput{HostedZoneId: r.Id} cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 // No paginator available for { response, err := svc.ListTrafficPolicyInstancesByHostedZone(ctx, &config, func(options *route53.Options) { diff --git a/plugins/source/aws/resources/services/route53/hosted_zones.go b/plugins/source/aws/resources/services/route53/hosted_zones.go index 32d4eafbc17f7b..5aecf847b5b9e6 100644 --- a/plugins/source/aws/resources/services/route53/hosted_zones.go +++ b/plugins/source/aws/resources/services/route53/hosted_zones.go @@ -49,7 +49,7 @@ func HostedZones() *schema.Table { func fetchRoute53HostedZones(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config route53.ListHostedZonesInput cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 processHostedZonesBundle := func(hostedZones []types.HostedZone) error { tagsCfg := &route53.ListTagsForResourcesInput{ResourceType: types.TagResourceTypeHostedzone, ResourceIds: make([]string, 0, len(hostedZones))} diff --git a/plugins/source/aws/resources/services/route53/operations.go b/plugins/source/aws/resources/services/route53/operations.go index b54e498ca33857..3a8987c9dd4bdb 100644 --- a/plugins/source/aws/resources/services/route53/operations.go +++ b/plugins/source/aws/resources/services/route53/operations.go @@ -27,7 +27,7 @@ func Operations() *schema.Table { func fetchRoute53Operations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53domains + svc := cl.Services(client.AWSServiceRoute53domains).Route53domains var input route53domains.ListOperationsInput paginator := route53domains.NewListOperationsPaginator(svc, &input) for paginator.HasMorePages() { @@ -43,7 +43,7 @@ func fetchRoute53Operations(ctx context.Context, meta schema.ClientMeta, parent } func getOperation(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Route53domains + svc := cl.Services(client.AWSServiceRoute53domains).Route53domains v := resource.Item.(types.OperationSummary) d, err := svc.GetOperationDetail(ctx, &route53domains.GetOperationDetailInput{OperationId: v.OperationId}, func(options *route53domains.Options) { diff --git a/plugins/source/aws/resources/services/route53/traffic_policies.go b/plugins/source/aws/resources/services/route53/traffic_policies.go index ed35c8d87d2ad3..b21ca2f453daf9 100644 --- a/plugins/source/aws/resources/services/route53/traffic_policies.go +++ b/plugins/source/aws/resources/services/route53/traffic_policies.go @@ -39,7 +39,7 @@ func TrafficPolicies() *schema.Table { func fetchRoute53TrafficPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { var config route53.ListTrafficPoliciesInput cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 for { response, err := svc.ListTrafficPolicies(ctx, &config, func(options *route53.Options) { @@ -61,7 +61,7 @@ func fetchRoute53TrafficPolicyVersions(ctx context.Context, meta schema.ClientMe r := parent.Item.(types.TrafficPolicySummary) config := route53.ListTrafficPolicyVersionsInput{Id: r.Id} cl := meta.(*client.Client) - svc := cl.Services().Route53 + svc := cl.Services(client.AWSServiceRoute53).Route53 // no paginator available for { response, err := svc.ListTrafficPolicyVersions(ctx, &config, func(options *route53.Options) { diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go index 20773d8371f34e..baf23abd7fc343 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/clusters.go @@ -33,7 +33,7 @@ func Clusters() *schema.Table { func fetchClusters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoverycontrolconfig + svc := cl.Services(client.AWSServiceRoute53recoverycontrolconfig).Route53recoverycontrolconfig paginator := route53recoverycontrolconfig.NewListClustersPaginator(svc, &route53recoverycontrolconfig.ListClustersInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoverycontrolconfig.Options) { diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go index 4127038a9735fd..5dd2adc42c6c8b 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/control_panel.go @@ -37,7 +37,7 @@ func ControlPanels() *schema.Table { func fetchControlPanels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoverycontrolconfig + svc := cl.Services(client.AWSServiceRoute53recoverycontrolconfig).Route53recoverycontrolconfig paginator := route53recoverycontrolconfig.NewListControlPanelsPaginator(svc, &route53recoverycontrolconfig.ListControlPanelsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoverycontrolconfig.Options) { diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go index 2fb846d12a866f..3bc5617945c45b 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/routing_controls.go @@ -32,7 +32,7 @@ func routingControls() *schema.Table { func fetchRoutingControls(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoverycontrolconfig + svc := cl.Services(client.AWSServiceRoute53recoverycontrolconfig).Route53recoverycontrolconfig controlPanel := parent.Item.(types.ControlPanel) paginator := route53recoverycontrolconfig.NewListRoutingControlsPaginator(svc, &route53recoverycontrolconfig.ListRoutingControlsInput{ ControlPanelArn: controlPanel.ControlPanelArn, diff --git a/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go b/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go index 9c7db909576474..5dae2264f0e9f1 100644 --- a/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go +++ b/plugins/source/aws/resources/services/route53recoverycontrolconfig/safety_rules.go @@ -32,7 +32,7 @@ func safetyRules() *schema.Table { func fetchSafetyRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoverycontrolconfig + svc := cl.Services(client.AWSServiceRoute53recoverycontrolconfig).Route53recoverycontrolconfig controlPanel := parent.Item.(types.ControlPanel) input := &route53recoverycontrolconfig.ListSafetyRulesInput{ ControlPanelArn: controlPanel.ControlPanelArn, diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go b/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go index 94c294491f0f20..cde862f4021bb4 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/cells.go @@ -33,7 +33,7 @@ func Cells() *schema.Table { func fetchCells(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoveryreadiness + svc := cl.Services(client.AWSServiceRoute53recoveryreadiness).Route53recoveryreadiness paginator := route53recoveryreadiness.NewListCellsPaginator(svc, &route53recoveryreadiness.ListCellsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoveryreadiness.Options) { diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go b/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go index d47e5ec827503b..2e76a82c78359e 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/readiness_checks.go @@ -33,7 +33,7 @@ func ReadinessChecks() *schema.Table { func fetchReadinessChecks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoveryreadiness + svc := cl.Services(client.AWSServiceRoute53recoveryreadiness).Route53recoveryreadiness paginator := route53recoveryreadiness.NewListReadinessChecksPaginator(svc, &route53recoveryreadiness.ListReadinessChecksInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoveryreadiness.Options) { diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go b/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go index b39f0c08565c5f..a5292b36e57607 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/recovery_groups.go @@ -33,7 +33,7 @@ func RecoveryGroups() *schema.Table { func fetchControlPanels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoveryreadiness + svc := cl.Services(client.AWSServiceRoute53recoveryreadiness).Route53recoveryreadiness paginator := route53recoveryreadiness.NewListRecoveryGroupsPaginator(svc, &route53recoveryreadiness.ListRecoveryGroupsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoveryreadiness.Options) { diff --git a/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go b/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go index df998bfb1893c5..4b06c1b439cb82 100644 --- a/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go +++ b/plugins/source/aws/resources/services/route53recoveryreadiness/resource_sets.go @@ -33,7 +33,7 @@ func ResourceSets() *schema.Table { func fetchResourceSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53recoveryreadiness + svc := cl.Services(client.AWSServiceRoute53recoveryreadiness).Route53recoveryreadiness paginator := route53recoveryreadiness.NewListResourceSetsPaginator(svc, &route53recoveryreadiness.ListResourceSetsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *route53recoveryreadiness.Options) { diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_configs.go b/plugins/source/aws/resources/services/route53resolver/firewall_configs.go index 5b257053088900..6550d3972ca925 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_configs.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_configs.go @@ -27,7 +27,7 @@ func FirewallConfigs() *schema.Table { func fetchFirewallConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListFirewallConfigsInput paginator := route53resolver.NewListFirewallConfigsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go b/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go index 87632eadbb2f4b..ab2ae94db0e963 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_domain_list.go @@ -28,7 +28,7 @@ func FirewallDomainLists() *schema.Table { func fetchFirewallDomainList(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListFirewallDomainListsInput paginator := route53resolver.NewListFirewallDomainListsPaginator(svc, &input) for paginator.HasMorePages() { @@ -44,7 +44,7 @@ func fetchFirewallDomainList(ctx context.Context, meta schema.ClientMeta, parent } func getFirewallDomainList(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver v := resource.Item.(types.FirewallDomainListMetadata) d, err := svc.GetFirewallDomainList(ctx, &route53resolver.GetFirewallDomainListInput{FirewallDomainListId: v.Id}, func(options *route53resolver.Options) { diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go b/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go index 714b8785552849..4d908126aae4a1 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_rule_group_associations.go @@ -27,7 +27,7 @@ func FirewallRuleGroupAssociations() *schema.Table { func fetchFirewallRuleGroupAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListFirewallRuleGroupAssociationsInput paginator := route53resolver.NewListFirewallRuleGroupAssociationsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go b/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go index f6eda5c8b1d7be..dcf0485af38774 100644 --- a/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go +++ b/plugins/source/aws/resources/services/route53resolver/firewall_rule_groups.go @@ -28,7 +28,7 @@ func FirewallRuleGroups() *schema.Table { func fetchFirewallRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListFirewallRuleGroupsInput paginator := route53resolver.NewListFirewallRuleGroupsPaginator(svc, &input) for paginator.HasMorePages() { @@ -45,7 +45,7 @@ func fetchFirewallRuleGroups(ctx context.Context, meta schema.ClientMeta, parent func getFirewallRuleGroups(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver v := resource.Item.(types.FirewallRuleGroupMetadata) d, err := svc.GetFirewallRuleGroup(ctx, &route53resolver.GetFirewallRuleGroupInput{FirewallRuleGroupId: v.Id}, func(options *route53resolver.Options) { diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go b/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go index 282ba6a4a8573c..6799ac58b55631 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_endpoints.go @@ -27,7 +27,7 @@ func ResolverEndpoints() *schema.Table { func fetchResolverEndpoints(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListResolverEndpointsInput paginator := route53resolver.NewListResolverEndpointsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go index f3a106a8409096..a67195e03a8d34 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_config_associations.go @@ -27,7 +27,7 @@ func ResolverQueryLogConfigAssociations() *schema.Table { func fetchQueryLogConfigAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListResolverQueryLogConfigAssociationsInput paginator := route53resolver.NewListResolverQueryLogConfigAssociationsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go index 71ba257533bf14..5d81c123e32d35 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_query_log_configs.go @@ -27,7 +27,7 @@ func ResolverQueryLogConfigs() *schema.Table { func fetchQueryLogConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListResolverQueryLogConfigsInput paginator := route53resolver.NewListResolverQueryLogConfigsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go b/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go index 1be7fef6ee9fc1..e8c86733775750 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_rule_associations.go @@ -27,7 +27,7 @@ func ResolverRuleAssociations() *schema.Table { func fetchResolverRuleAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListResolverRuleAssociationsInput paginator := route53resolver.NewListResolverRuleAssociationsPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/route53resolver/resolver_rules.go b/plugins/source/aws/resources/services/route53resolver/resolver_rules.go index 2620e761c0c12e..897b38dc9d0a1d 100644 --- a/plugins/source/aws/resources/services/route53resolver/resolver_rules.go +++ b/plugins/source/aws/resources/services/route53resolver/resolver_rules.go @@ -27,7 +27,7 @@ func ResolverRules() *schema.Table { func fetchResolverRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Route53resolver + svc := cl.Services(client.AWSServiceRoute53resolver).Route53resolver var input route53resolver.ListResolverRulesInput paginator := route53resolver.NewListResolverRulesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/s3/access_points.go b/plugins/source/aws/resources/services/s3/access_points.go index 1649467d189678..7a2ba97ca5e878 100644 --- a/plugins/source/aws/resources/services/s3/access_points.go +++ b/plugins/source/aws/resources/services/s3/access_points.go @@ -35,7 +35,7 @@ func AccessPoints() *schema.Table { func fetchAccessPoints(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().S3control + svc := cl.Services(client.AWSServiceS3control).S3control paginator := s3control.NewListAccessPointsPaginator(svc, &s3control.ListAccessPointsInput{ AccountId: aws.String(cl.AccountID), diff --git a/plugins/source/aws/resources/services/s3/accounts.go b/plugins/source/aws/resources/services/s3/accounts.go index 39f2774e636b35..e15ff5a6a9bdef 100644 --- a/plugins/source/aws/resources/services/s3/accounts.go +++ b/plugins/source/aws/resources/services/s3/accounts.go @@ -29,7 +29,7 @@ func Accounts() *schema.Table { func fetchS3Accounts(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().S3control + svc := cl.Services(client.AWSServiceS3control).S3control var accountConfig s3control.GetPublicAccessBlockInput accountConfig.AccountId = aws.String(cl.AccountID) diff --git a/plugins/source/aws/resources/services/s3/bucket_cors_rules.go b/plugins/source/aws/resources/services/s3/bucket_cors_rules.go index d9910fd3176081..a98f4c64cdfc5e 100644 --- a/plugins/source/aws/resources/services/s3/bucket_cors_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_cors_rules.go @@ -32,7 +32,7 @@ func bucketCorsRules() *schema.Table { func fetchS3BucketCorsRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 region := parent.Get("region").(*scalar.String) if region == nil { return nil diff --git a/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go b/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go index b531d361945ab0..a2a787deedf36d 100644 --- a/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go +++ b/plugins/source/aws/resources/services/s3/bucket_encryption_rules.go @@ -34,7 +34,7 @@ func bucketEncryptionRules() *schema.Table { func fetchS3BucketEncryptionRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 region := parent.Get("region").(*scalar.String) if region == nil { return nil diff --git a/plugins/source/aws/resources/services/s3/bucket_grants.go b/plugins/source/aws/resources/services/s3/bucket_grants.go index db50424a159659..07711702ccc002 100644 --- a/plugins/source/aws/resources/services/s3/bucket_grants.go +++ b/plugins/source/aws/resources/services/s3/bucket_grants.go @@ -52,7 +52,7 @@ func bucketGrants() *schema.Table { func fetchS3BucketGrants(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 region := parent.Get("region").(*scalar.String) if region == nil { return nil diff --git a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go index c02bc35c1c61d5..b6413a069b749d 100644 --- a/plugins/source/aws/resources/services/s3/bucket_lifecycles.go +++ b/plugins/source/aws/resources/services/s3/bucket_lifecycles.go @@ -33,7 +33,7 @@ func bucketLifecycles() *schema.Table { func fetchS3BucketLifecycles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 region := parent.Get("region").(*scalar.String) if region == nil { return nil diff --git a/plugins/source/aws/resources/services/s3/bucket_websites.go b/plugins/source/aws/resources/services/s3/bucket_websites.go index ee1bfa9f354c0d..aefaaca3a0f606 100644 --- a/plugins/source/aws/resources/services/s3/bucket_websites.go +++ b/plugins/source/aws/resources/services/s3/bucket_websites.go @@ -31,7 +31,7 @@ func bucketWebsites() *schema.Table { func fetchS3BucketWebsites(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { r := parent.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 region := parent.Get("region").(*scalar.String) if region == nil { return nil diff --git a/plugins/source/aws/resources/services/s3/buckets.go b/plugins/source/aws/resources/services/s3/buckets.go index b1cdd716182e19..e0a4377dca76d0 100644 --- a/plugins/source/aws/resources/services/s3/buckets.go +++ b/plugins/source/aws/resources/services/s3/buckets.go @@ -44,7 +44,7 @@ func Buckets() *schema.Table { func listS3Buckets(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 response, err := svc.ListBuckets(ctx, nil, func(o *s3.Options) { o.Region = listBucketRegion(cl) }) @@ -77,7 +77,7 @@ func listBucketRegion(cl *client.Client) string { func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, r *schema.Resource) error { resource := r.Item.(*models.WrappedBucket) cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 output, err := svc.GetBucketLocation(ctx, &s3.GetBucketLocationInput{ Bucket: resource.Name, @@ -125,7 +125,7 @@ func resolveS3BucketsAttributes(ctx context.Context, meta schema.ClientMeta, r * func resolveBucketLogging(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 loggingOutput, err := svc.GetBucketLogging(ctx, &s3.GetBucketLoggingInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -145,7 +145,7 @@ func resolveBucketLogging(ctx context.Context, meta schema.ClientMeta, resource func resolveBucketPolicy(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 policyOutput, err := svc.GetBucketPolicy(ctx, &s3.GetBucketPolicyInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -174,7 +174,7 @@ func resolveBucketPolicy(ctx context.Context, meta schema.ClientMeta, resource * func resolveBucketPolicyStatus(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 policyStatusOutput, err := svc.GetBucketPolicyStatus(ctx, &s3.GetBucketPolicyStatusInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -196,7 +196,7 @@ func resolveBucketPolicyStatus(ctx context.Context, meta schema.ClientMeta, reso func resolveBucketVersioning(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 versioningOutput, err := svc.GetBucketVersioning(ctx, &s3.GetBucketVersioningInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -213,7 +213,7 @@ func resolveBucketVersioning(ctx context.Context, meta schema.ClientMeta, resour func resolveBucketPublicAccessBlock(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 publicAccessOutput, err := svc.GetPublicAccessBlock(ctx, &s3.GetPublicAccessBlockInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -236,7 +236,7 @@ func resolveBucketPublicAccessBlock(ctx context.Context, meta schema.ClientMeta, func resolveBucketReplication(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 replicationOutput, err := svc.GetBucketReplication(ctx, &s3.GetBucketReplicationInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -261,7 +261,7 @@ func resolveBucketReplication(ctx context.Context, meta schema.ClientMeta, resou func resolveBucketTagging(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 taggingOutput, err := svc.GetBucketTagging(ctx, &s3.GetBucketTaggingInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region }) @@ -288,7 +288,7 @@ func resolveBucketTagging(ctx context.Context, meta schema.ClientMeta, resource func resolveBucketOwnershipControls(ctx context.Context, meta schema.ClientMeta, resource *models.WrappedBucket) error { cl := meta.(*client.Client) - svc := cl.Services().S3 + svc := cl.Services(client.AWSServiceS3).S3 getBucketOwnershipControlOutput, err := svc.GetBucketOwnershipControls(ctx, &s3.GetBucketOwnershipControlsInput{Bucket: resource.Name}, func(o *s3.Options) { o.Region = resource.Region diff --git a/plugins/source/aws/resources/services/s3/multi_region_access_points.go b/plugins/source/aws/resources/services/s3/multi_region_access_points.go index 29cba071168b2d..0aa92c5f9dede1 100644 --- a/plugins/source/aws/resources/services/s3/multi_region_access_points.go +++ b/plugins/source/aws/resources/services/s3/multi_region_access_points.go @@ -37,7 +37,7 @@ func MultiRegionAccessPoints() *schema.Table { func fetchMultiRegionAccessPoints(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().S3control + svc := cl.Services(client.AWSServiceS3control).S3control paginator := s3control.NewListMultiRegionAccessPointsPaginator(svc, &s3control.ListMultiRegionAccessPointsInput{ AccountId: aws.String(cl.AccountID), diff --git a/plugins/source/aws/resources/services/sagemaker/apps.go b/plugins/source/aws/resources/services/sagemaker/apps.go index d1942eafb36f6a..553cc07579c487 100644 --- a/plugins/source/aws/resources/services/sagemaker/apps.go +++ b/plugins/source/aws/resources/services/sagemaker/apps.go @@ -42,7 +42,7 @@ func Apps() *schema.Table { } func fetchSagemakerApps(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker paginator := sagemaker.NewListAppsPaginator(svc, &sagemaker.ListAppsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *sagemaker.Options) { @@ -58,7 +58,7 @@ func fetchSagemakerApps(ctx context.Context, meta schema.ClientMeta, _ *schema.R func getApp(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker n := resource.Item.(types.AppDetails) input := &sagemaker.DescribeAppInput{ AppName: n.AppName, @@ -87,7 +87,7 @@ func getApp(ctx context.Context, meta schema.ClientMeta, resource *schema.Resour func resolveSagemakerAppTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, _ schema.Column) error { r := resource.Item.(*sagemaker.DescribeAppOutput) cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker response, err := svc.ListTags(ctx, &sagemaker.ListTagsInput{ ResourceArn: r.AppArn, diff --git a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go index c63e408fa8a976..01aa0717832497 100644 --- a/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go +++ b/plugins/source/aws/resources/services/sagemaker/endpoint_configurations.go @@ -43,7 +43,7 @@ func EndpointConfigurations() *schema.Table { func fetchSagemakerEndpointConfigurations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListEndpointConfigsInput{} paginator := sagemaker.NewListEndpointConfigsPaginator(svc, &config) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchSagemakerEndpointConfigurations(ctx context.Context, meta schema.Clien func getEndpointConfiguration(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker n := resource.Item.(types.EndpointConfigSummary) response, err := svc.DescribeEndpointConfig(ctx, &sagemaker.DescribeEndpointConfigInput{ @@ -79,7 +79,7 @@ func getEndpointConfiguration(ctx context.Context, meta schema.ClientMeta, resou func resolveSagemakerEndpointConfigurationTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { r := resource.Item.(*sagemaker.DescribeEndpointConfigOutput) cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListTagsInput{ ResourceArn: r.EndpointConfigArn, } diff --git a/plugins/source/aws/resources/services/sagemaker/models.go b/plugins/source/aws/resources/services/sagemaker/models.go index 02e67610b3d943..fa900be3473cb5 100644 --- a/plugins/source/aws/resources/services/sagemaker/models.go +++ b/plugins/source/aws/resources/services/sagemaker/models.go @@ -49,7 +49,7 @@ type WrappedSageMakerModel struct { func fetchSagemakerModels(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListModelsInput{} paginator := sagemaker.NewListModelsPaginator(svc, &config) for paginator.HasMorePages() { @@ -66,7 +66,7 @@ func fetchSagemakerModels(ctx context.Context, meta schema.ClientMeta, _ *schema func getModel(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker n := resource.Item.(types.ModelSummary) response, err := svc.DescribeModel(ctx, &sagemaker.DescribeModelInput{ @@ -89,7 +89,7 @@ func getModel(ctx context.Context, meta schema.ClientMeta, resource *schema.Reso func resolveSagemakerModelTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { r := resource.Item.(*WrappedSageMakerModel) cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := &sagemaker.ListTagsInput{ ResourceArn: r.ModelArn, diff --git a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go index 91ffa612125ae4..ab6bd3b4e33f34 100644 --- a/plugins/source/aws/resources/services/sagemaker/notebook_instances.go +++ b/plugins/source/aws/resources/services/sagemaker/notebook_instances.go @@ -49,7 +49,7 @@ type WrappedSageMakerNotebookInstance struct { func fetchSagemakerNotebookInstances(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListNotebookInstancesInput{} paginator := sagemaker.NewListNotebookInstancesPaginator(svc, &config) for paginator.HasMorePages() { @@ -67,7 +67,7 @@ func fetchSagemakerNotebookInstances(ctx context.Context, meta schema.ClientMeta func getNotebookInstance(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker n := resource.Item.(types.NotebookInstanceSummary) // get more details about the notebook instance @@ -91,7 +91,7 @@ func getNotebookInstance(ctx context.Context, meta schema.ClientMeta, resource * func resolveSagemakerNotebookInstanceTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) error { r := resource.Item.(*WrappedSageMakerNotebookInstance) cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListTagsInput{ ResourceArn: &r.NotebookInstanceArn, } diff --git a/plugins/source/aws/resources/services/sagemaker/training_jobs.go b/plugins/source/aws/resources/services/sagemaker/training_jobs.go index 571b77dca3d5a5..7c5e5348ac8bc5 100644 --- a/plugins/source/aws/resources/services/sagemaker/training_jobs.go +++ b/plugins/source/aws/resources/services/sagemaker/training_jobs.go @@ -43,7 +43,7 @@ func TrainingJobs() *schema.Table { func fetchSagemakerTrainingJobs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListTrainingJobsInput{} paginator := sagemaker.NewListTrainingJobsPaginator(svc, &config) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchSagemakerTrainingJobs(ctx context.Context, meta schema.ClientMeta, par func getTrainingJob(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker n := resource.Item.(types.TrainingJobSummary) config := sagemaker.DescribeTrainingJobInput{ TrainingJobName: n.TrainingJobName, @@ -81,7 +81,7 @@ func resolveSagemakerTrainingJobTags(ctx context.Context, meta schema.ClientMeta return nil } cl := meta.(*client.Client) - svc := cl.Services().Sagemaker + svc := cl.Services(client.AWSServiceSagemaker).Sagemaker config := sagemaker.ListTagsInput{ResourceArn: r.TrainingJobArn} paginator := sagemaker.NewListTagsPaginator(svc, &config) var tags []types.Tag diff --git a/plugins/source/aws/resources/services/savingsplans/savingsplans.go b/plugins/source/aws/resources/services/savingsplans/savingsplans.go index ac66d26172b532..f89de5c38b3bfe 100644 --- a/plugins/source/aws/resources/services/savingsplans/savingsplans.go +++ b/plugins/source/aws/resources/services/savingsplans/savingsplans.go @@ -35,7 +35,7 @@ func Plans() *schema.Table { func fetchSavingsPlans(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Savingsplans + svc := cl.Services(client.AWSServiceSavingsplans).Savingsplans config := savingsplans.DescribeSavingsPlansInput{ MaxResults: aws.Int32(1000), } diff --git a/plugins/source/aws/resources/services/scheduler/schedule_groups.go b/plugins/source/aws/resources/services/scheduler/schedule_groups.go index b6c9c4ad1a4307..ded00aaab7222a 100644 --- a/plugins/source/aws/resources/services/scheduler/schedule_groups.go +++ b/plugins/source/aws/resources/services/scheduler/schedule_groups.go @@ -46,7 +46,7 @@ func fetchSchedulerScheduleGroups(ctx context.Context, meta schema.ClientMeta, p MaxResults: aws.Int32(100), } cl := meta.(*client.Client) - svc := cl.Services().Scheduler + svc := cl.Services(client.AWSServiceScheduler).Scheduler paginator := scheduler.NewListScheduleGroupsPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(o *scheduler.Options) { diff --git a/plugins/source/aws/resources/services/scheduler/schedules.go b/plugins/source/aws/resources/services/scheduler/schedules.go index c70bb20d404870..1709e0e50396cf 100644 --- a/plugins/source/aws/resources/services/scheduler/schedules.go +++ b/plugins/source/aws/resources/services/scheduler/schedules.go @@ -48,7 +48,7 @@ func fetchSchedulerSchedules(ctx context.Context, meta schema.ClientMeta, parent MaxResults: aws.Int32(100), } cl := meta.(*client.Client) - svc := cl.Services().Scheduler + svc := cl.Services(client.AWSServiceScheduler).Scheduler paginator := scheduler.NewListSchedulesPaginator(svc, &config) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx, func(o *scheduler.Options) { @@ -64,7 +64,7 @@ func fetchSchedulerSchedules(ctx context.Context, meta schema.ClientMeta, parent func getSchedule(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Scheduler + svc := cl.Services(client.AWSServiceScheduler).Scheduler scheduleSummary := resource.Item.(types.ScheduleSummary) describeTaskDefinitionOutput, err := svc.GetSchedule(ctx, &scheduler.GetScheduleInput{ @@ -85,7 +85,7 @@ func resolveSchedulerScheduleTags() schema.ColumnResolver { return func(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { arnStr := funk.Get(r.Item, "Arn", funk.WithAllowZero()).(*string) cl := meta.(*client.Client) - svc := cl.Services().Scheduler + svc := cl.Services(client.AWSServiceScheduler).Scheduler params := scheduler.ListTagsForResourceInput{ResourceArn: arnStr} output, err := svc.ListTagsForResource(ctx, ¶ms, func(o *scheduler.Options) { diff --git a/plugins/source/aws/resources/services/secretsmanager/secrets.go b/plugins/source/aws/resources/services/secretsmanager/secrets.go index 611c7a5e92e974..f0df6bb42aec1e 100644 --- a/plugins/source/aws/resources/services/secretsmanager/secrets.go +++ b/plugins/source/aws/resources/services/secretsmanager/secrets.go @@ -52,7 +52,7 @@ func Secrets() *schema.Table { func fetchSecretsmanagerSecrets(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Secretsmanager + svc := cl.Services(client.AWSServiceSecretsmanager).Secretsmanager paginator := secretsmanager.NewListSecretsPaginator(svc, &secretsmanager.ListSecretsInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *secretsmanager.Options) { @@ -68,7 +68,7 @@ func fetchSecretsmanagerSecrets(ctx context.Context, meta schema.ClientMeta, _ * func getSecret(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Secretsmanager + svc := cl.Services(client.AWSServiceSecretsmanager).Secretsmanager n := resource.Item.(types.SecretListEntry) // get more details about the secret @@ -88,7 +88,7 @@ func getSecret(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func fetchSecretsmanagerSecretPolicy(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(*secretsmanager.DescribeSecretOutput) cl := meta.(*client.Client) - svc := cl.Services().Secretsmanager + svc := cl.Services(client.AWSServiceSecretsmanager).Secretsmanager cfg := secretsmanager.GetResourcePolicyInput{ SecretId: r.ARN, } diff --git a/plugins/source/aws/resources/services/secretsmanager/secrets_version.go b/plugins/source/aws/resources/services/secretsmanager/secrets_version.go index fa24e74fc1130c..dc14476e51e47c 100644 --- a/plugins/source/aws/resources/services/secretsmanager/secrets_version.go +++ b/plugins/source/aws/resources/services/secretsmanager/secrets_version.go @@ -35,7 +35,7 @@ func secretVersions() *schema.Table { func fetchSecretsmanagerSecretsVersions(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, res chan<- any) error { secret := resource.Item.(*secretsmanager.DescribeSecretOutput) cl := meta.(*client.Client) - svc := cl.Services().Secretsmanager + svc := cl.Services(client.AWSServiceSecretsmanager).Secretsmanager paginator := secretsmanager.NewListSecretVersionIdsPaginator(svc, &secretsmanager.ListSecretVersionIdsInput{ SecretId: secret.ARN, IncludeDeprecated: aws.Bool(true), diff --git a/plugins/source/aws/resources/services/securityhub/enabled_standards.go b/plugins/source/aws/resources/services/securityhub/enabled_standards.go index 75d80f2b83fb97..671a8c85e0eba1 100644 --- a/plugins/source/aws/resources/services/securityhub/enabled_standards.go +++ b/plugins/source/aws/resources/services/securityhub/enabled_standards.go @@ -28,7 +28,7 @@ func EnabledStandards() *schema.Table { func fetchEnabledStandards(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Securityhub + svc := cl.Services(client.AWSServiceSecurityhub).Securityhub config := securityhub.GetEnabledStandardsInput{MaxResults: 100} p := securityhub.NewGetEnabledStandardsPaginator(svc, &config) for p.HasMorePages() { diff --git a/plugins/source/aws/resources/services/securityhub/findings.go b/plugins/source/aws/resources/services/securityhub/findings.go index f04a59549d980f..67e00039bf8992 100644 --- a/plugins/source/aws/resources/services/securityhub/findings.go +++ b/plugins/source/aws/resources/services/securityhub/findings.go @@ -53,7 +53,7 @@ func fetchFindings(ctx context.Context, meta schema.ClientMeta, parent *schema.R allConfigs = []tableoptions.CustomGetFindingsOpts{{GetFindingsInput: securityhub.GetFindingsInput{MaxResults: 100}}} } - svc := cl.Services().Securityhub + svc := cl.Services(client.AWSServiceSecurityhub).Securityhub var config securityhub.GetFindingsInput for _, w := range allConfigs { diff --git a/plugins/source/aws/resources/services/securityhub/hubs.go b/plugins/source/aws/resources/services/securityhub/hubs.go index 55735cd8438691..cf3a821af6a65a 100644 --- a/plugins/source/aws/resources/services/securityhub/hubs.go +++ b/plugins/source/aws/resources/services/securityhub/hubs.go @@ -37,7 +37,7 @@ func Hubs() *schema.Table { func fetchHubs(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Securityhub + svc := cl.Services(client.AWSServiceSecurityhub).Securityhub hub, err := svc.DescribeHub(ctx, nil, func(o *securityhub.Options) { o.Region = cl.Region }) @@ -50,7 +50,7 @@ func fetchHubs(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, func fetchHubTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Securityhub + svc := cl.Services(client.AWSServiceSecurityhub).Securityhub config := &securityhub.ListTagsForResourceInput{ResourceArn: resource.Item.(*securityhub.DescribeHubOutput).HubArn} tags, err := svc.ListTagsForResource(ctx, config, func(o *securityhub.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/servicecatalog/launch_paths.go b/plugins/source/aws/resources/services/servicecatalog/launch_paths.go index 91e827339d0c1b..01d00651be559c 100644 --- a/plugins/source/aws/resources/services/servicecatalog/launch_paths.go +++ b/plugins/source/aws/resources/services/servicecatalog/launch_paths.go @@ -53,7 +53,7 @@ func launchPaths() *schema.Table { } func listLaunchPaths(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog p := parent.Item.(types.ProvisionedProductAttribute) input := servicecatalog.ListLaunchPathsInput{ diff --git a/plugins/source/aws/resources/services/servicecatalog/portfolios.go b/plugins/source/aws/resources/services/servicecatalog/portfolios.go index e1819eda592bef..849eae312010be 100644 --- a/plugins/source/aws/resources/services/servicecatalog/portfolios.go +++ b/plugins/source/aws/resources/services/servicecatalog/portfolios.go @@ -42,7 +42,7 @@ func Portfolios() *schema.Table { func fetchServicecatalogPortfolios(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog paginator := servicecatalog.NewListPortfoliosPaginator(svc, &servicecatalog.ListPortfoliosInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *servicecatalog.Options) { @@ -59,8 +59,7 @@ func fetchServicecatalogPortfolios(ctx context.Context, meta schema.ClientMeta, func getPortfolio(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog - + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog response, err := svc.DescribePortfolio(ctx, &servicecatalog.DescribePortfolioInput{ Id: resource.Item.(types.PortfolioDetail).Id, }, func(o *servicecatalog.Options) { diff --git a/plugins/source/aws/resources/services/servicecatalog/products.go b/plugins/source/aws/resources/services/servicecatalog/products.go index 81082f3dd1adbd..1b97dd1e0a1084 100644 --- a/plugins/source/aws/resources/services/servicecatalog/products.go +++ b/plugins/source/aws/resources/services/servicecatalog/products.go @@ -42,7 +42,7 @@ func Products() *schema.Table { func fetchServicecatalogProducts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog listInput := new(servicecatalog.SearchProductsAsAdminInput) paginator := servicecatalog.NewSearchProductsAsAdminPaginator(svc, listInput) @@ -61,7 +61,7 @@ func fetchServicecatalogProducts(ctx context.Context, meta schema.ClientMeta, pa func getServicecatalogProduct(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog response, err := svc.DescribeProductAsAdmin(ctx, &servicecatalog.DescribeProductAsAdminInput{ Id: resource.Item.(types.ProductViewDetail).ProductViewSummary.ProductId, diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go index 0b453ca4d8e164..4b68b5ad5602ba 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioned_products.go @@ -45,7 +45,7 @@ func ProvisionedProducts() *schema.Table { func fetchServicecatalogProvisionedProducts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog listInput := new(servicecatalog.SearchProvisionedProductsInput) paginator := servicecatalog.NewSearchProvisionedProductsPaginator(svc, listInput) diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go b/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go index 9bfd39cbafe362..61ded35d6806c8 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioning_artifact.go @@ -45,7 +45,7 @@ func provisioningArtifact() *schema.Table { func fetchProvisioningArtifacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog p := parent.Item.(types.ProvisionedProductAttribute) input := servicecatalog.DescribeProvisioningArtifactInput{ diff --git a/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go b/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go index b0f9cad3b7ae5e..a31bc837b22645 100644 --- a/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go +++ b/plugins/source/aws/resources/services/servicecatalog/provisioning_parameters.go @@ -51,7 +51,7 @@ func provisioningParameters() *schema.Table { func fetchProvisioningParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicecatalog + svc := cl.Services(client.AWSServiceServicecatalog).Servicecatalog p := parent.Parent.Item.(types.ProvisionedProductAttribute) launchPathSummary := parent.Item.(types.LaunchPathSummary) input := servicecatalog.DescribeProvisioningParametersInput{ diff --git a/plugins/source/aws/resources/services/servicediscovery/helpers.go b/plugins/source/aws/resources/services/servicediscovery/helpers.go index 3bf36b9cf1ebb5..3ad9c32cad7fc5 100644 --- a/plugins/source/aws/resources/services/servicediscovery/helpers.go +++ b/plugins/source/aws/resources/services/servicediscovery/helpers.go @@ -14,7 +14,7 @@ func resolveServicediscoveryTags(path string) schema.ColumnResolver { return func(ctx context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error { arn := funk.Get(r.Item, path, funk.WithAllowZero()).(*string) cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery params := servicediscovery.ListTagsForResourceInput{ResourceARN: arn} output, err := svc.ListTagsForResource(ctx, ¶ms, func(options *servicediscovery.Options) { diff --git a/plugins/source/aws/resources/services/servicediscovery/instances.go b/plugins/source/aws/resources/services/servicediscovery/instances.go index 9801eabd234b32..495c33d5895428 100644 --- a/plugins/source/aws/resources/services/servicediscovery/instances.go +++ b/plugins/source/aws/resources/services/servicediscovery/instances.go @@ -27,7 +27,7 @@ func instances() *schema.Table { func fetchInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery service := parent.Item.(*types.Service) config := servicediscovery.ListInstancesInput{ ServiceId: service.Id, @@ -48,7 +48,7 @@ func fetchInstances(ctx context.Context, meta schema.ClientMeta, parent *schema. func getInstance(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery instance := resource.Item.(types.InstanceSummary) service := resource.Parent.Item.(*types.Service) config := &servicediscovery.GetInstanceInput{ diff --git a/plugins/source/aws/resources/services/servicediscovery/namespaces.go b/plugins/source/aws/resources/services/servicediscovery/namespaces.go index baf2d2996d62fe..6eee32fbfbd566 100644 --- a/plugins/source/aws/resources/services/servicediscovery/namespaces.go +++ b/plugins/source/aws/resources/services/servicediscovery/namespaces.go @@ -35,7 +35,7 @@ func Namespaces() *schema.Table { } func fetchNamespaces(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery input := servicediscovery.ListNamespacesInput{MaxResults: aws.Int32(100)} paginator := servicediscovery.NewListNamespacesPaginator(svc, &input) for paginator.HasMorePages() { @@ -52,7 +52,7 @@ func fetchNamespaces(ctx context.Context, meta schema.ClientMeta, parent *schema func getNamespace(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery namespace := resource.Item.(types.NamespaceSummary) desc, err := svc.GetNamespace(ctx, &servicediscovery.GetNamespaceInput{Id: namespace.Id}, func(o *servicediscovery.Options) { diff --git a/plugins/source/aws/resources/services/servicediscovery/services.go b/plugins/source/aws/resources/services/servicediscovery/services.go index b7ceda881c721f..06916e53b554cb 100644 --- a/plugins/source/aws/resources/services/servicediscovery/services.go +++ b/plugins/source/aws/resources/services/servicediscovery/services.go @@ -38,7 +38,7 @@ func Services() *schema.Table { } func fetchServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery input := servicediscovery.ListServicesInput{MaxResults: aws.Int32(100)} paginator := servicediscovery.NewListServicesPaginator(svc, &input) for paginator.HasMorePages() { @@ -55,7 +55,7 @@ func fetchServices(ctx context.Context, meta schema.ClientMeta, parent *schema.R func getService(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Servicediscovery + svc := cl.Services(client.AWSServiceServicediscovery).Servicediscovery namespace := resource.Item.(types.ServiceSummary) desc, err := svc.GetService(ctx, &servicediscovery.GetServiceInput{Id: namespace.Id}, func(o *servicediscovery.Options) { diff --git a/plugins/source/aws/resources/services/servicequotas/quotas.go b/plugins/source/aws/resources/services/servicequotas/quotas.go index e9e0f4d6086c96..aa55ec8cb3edbb 100644 --- a/plugins/source/aws/resources/services/servicequotas/quotas.go +++ b/plugins/source/aws/resources/services/servicequotas/quotas.go @@ -33,7 +33,7 @@ func quotas() *schema.Table { func fetchServicequotasQuotas(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Servicequotas + svc := cl.Services(client.AWSServiceServicequotas).Servicequotas service := parent.Item.(types.ServiceInfo) config := servicequotas.ListServiceQuotasInput{ ServiceCode: service.ServiceCode, diff --git a/plugins/source/aws/resources/services/servicequotas/services.go b/plugins/source/aws/resources/services/servicequotas/services.go index 571993e9c90383..b382663d1ffbe7 100644 --- a/plugins/source/aws/resources/services/servicequotas/services.go +++ b/plugins/source/aws/resources/services/servicequotas/services.go @@ -49,7 +49,7 @@ func fetchServicequotasServices(ctx context.Context, meta schema.ClientMeta, par } cl := meta.(*client.Client) - svc := cl.Services().Servicequotas + svc := cl.Services(client.AWSServiceServicequotas).Servicequotas servicePaginator := servicequotas.NewListServicesPaginator(svc, &config) for servicePaginator.HasMorePages() { output, err := servicePaginator.NextPage(ctx, func(o *servicequotas.Options) { diff --git a/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go b/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go index 604826c0748a68..7903dc03a51d7e 100644 --- a/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go +++ b/plugins/source/aws/resources/services/ses/active_receipt_rule_sets.go @@ -51,7 +51,7 @@ func isRegionSupported(region string) bool { func fetchSesActiveReceiptRuleSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ses + svc := cl.Services(client.AWSServiceSes).Ses set, err := svc.DescribeActiveReceiptRuleSet(ctx, nil, func(o *ses.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go b/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go index 923517a77bcc45..fd115cd6b03ae1 100644 --- a/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go +++ b/plugins/source/aws/resources/services/ses/configuration_set_event_destinations.go @@ -39,7 +39,7 @@ func configurationSetEventDestinations() *schema.Table { func fetchSesConfigurationSetEventDestinations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 s := parent.Item.(*sesv2.GetConfigurationSetOutput) diff --git a/plugins/source/aws/resources/services/ses/configuration_sets.go b/plugins/source/aws/resources/services/ses/configuration_sets.go index 8f076ef3b9be0d..1bcae8d7851bfb 100644 --- a/plugins/source/aws/resources/services/ses/configuration_sets.go +++ b/plugins/source/aws/resources/services/ses/configuration_sets.go @@ -49,7 +49,7 @@ func ConfigurationSets() *schema.Table { func fetchSesConfigurationSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 p := sesv2.NewListConfigurationSetsPaginator(svc, nil) for p.HasMorePages() { @@ -67,7 +67,7 @@ func fetchSesConfigurationSets(ctx context.Context, meta schema.ClientMeta, pare func getConfigurationSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 csName := resource.Item.(string) getOutput, err := svc.GetConfigurationSet(ctx, &sesv2.GetConfigurationSetInput{ConfigurationSetName: &csName}, func(o *sesv2.Options) { diff --git a/plugins/source/aws/resources/services/ses/contact_lists.go b/plugins/source/aws/resources/services/ses/contact_lists.go index 83a7c75e42ebbd..e31a6a4a7b91d0 100644 --- a/plugins/source/aws/resources/services/ses/contact_lists.go +++ b/plugins/source/aws/resources/services/ses/contact_lists.go @@ -42,7 +42,7 @@ func ContactLists() *schema.Table { func fetchSesContactLists(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 p := sesv2.NewListContactListsPaginator(svc, nil) for p.HasMorePages() { @@ -60,7 +60,7 @@ func fetchSesContactLists(ctx context.Context, meta schema.ClientMeta, parent *s func getContactList(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 item := resource.Item.(types.ContactList) getOutput, err := svc.GetContactList(ctx, diff --git a/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go b/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go index b763b518b19a7f..071110584b1db5 100644 --- a/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go +++ b/plugins/source/aws/resources/services/ses/custom_verification_email_templates.go @@ -39,7 +39,7 @@ func CustomVerificationEmailTemplates() *schema.Table { func fetchSesCustomVerificationEmailTemplates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 p := sesv2.NewListCustomVerificationEmailTemplatesPaginator(svc, nil) for p.HasMorePages() { @@ -57,7 +57,7 @@ func fetchSesCustomVerificationEmailTemplates(ctx context.Context, meta schema.C func getCustomVerificationEmailTemplate(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 name := resource.Item.(types.CustomVerificationEmailTemplateMetadata).TemplateName getOutput, err := svc.GetCustomVerificationEmailTemplate(ctx, diff --git a/plugins/source/aws/resources/services/ses/identities.go b/plugins/source/aws/resources/services/ses/identities.go index b3b3500b5de151..c3607b04291da3 100644 --- a/plugins/source/aws/resources/services/ses/identities.go +++ b/plugins/source/aws/resources/services/ses/identities.go @@ -43,7 +43,7 @@ func Identities() *schema.Table { func fetchSesIdentities(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 p := sesv2.NewListEmailIdentitiesPaginator(svc, nil) for p.HasMorePages() { @@ -61,7 +61,7 @@ func fetchSesIdentities(ctx context.Context, meta schema.ClientMeta, parent *sch func getIdentity(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 ei := resource.Item.(types.IdentityInfo) getOutput, err := svc.GetEmailIdentity(ctx, diff --git a/plugins/source/aws/resources/services/ses/templates.go b/plugins/source/aws/resources/services/ses/templates.go index 86e775e2483484..5dea0f17a2c0f7 100644 --- a/plugins/source/aws/resources/services/ses/templates.go +++ b/plugins/source/aws/resources/services/ses/templates.go @@ -36,7 +36,7 @@ func Templates() *schema.Table { func fetchSesTemplates(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 p := sesv2.NewListEmailTemplatesPaginator(svc, nil) for p.HasMorePages() { @@ -54,7 +54,7 @@ func fetchSesTemplates(ctx context.Context, meta schema.ClientMeta, parent *sche func getTemplate(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sesv2 + svc := cl.Services(client.AWSServiceSesv2).Sesv2 templateMeta := resource.Item.(types.EmailTemplateMetadata) getOutput, err := svc.GetEmailTemplate(ctx, diff --git a/plugins/source/aws/resources/services/shield/attacks.go b/plugins/source/aws/resources/services/shield/attacks.go index 0261312fa0da65..027dd6c2668f32 100644 --- a/plugins/source/aws/resources/services/shield/attacks.go +++ b/plugins/source/aws/resources/services/shield/attacks.go @@ -36,7 +36,7 @@ func Attacks() *schema.Table { func fetchShieldAttacks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield end := time.Now() start := end.Add(-time.Hour * 24) config := shield.ListAttacksInput{ @@ -58,7 +58,7 @@ func fetchShieldAttacks(ctx context.Context, meta schema.ClientMeta, parent *sch func getAttack(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield a := resource.Item.(types.AttackSummary) attack, err := svc.DescribeAttack(ctx, &shield.DescribeAttackInput{AttackId: a.AttackId}, func(o *shield.Options) { diff --git a/plugins/source/aws/resources/services/shield/protection_groups.go b/plugins/source/aws/resources/services/shield/protection_groups.go index 687a8f068da269..6cdac4427acb0b 100644 --- a/plugins/source/aws/resources/services/shield/protection_groups.go +++ b/plugins/source/aws/resources/services/shield/protection_groups.go @@ -40,7 +40,7 @@ func ProtectionGroups() *schema.Table { func fetchShieldProtectionGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield config := shield.ListProtectionGroupsInput{} paginator := shield.NewListProtectionGroupsPaginator(svc, &config) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchShieldProtectionGroups(ctx context.Context, meta schema.ClientMeta, pa func resolveShieldProtectionGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.ProtectionGroup) cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield config := shield.ListTagsForResourceInput{ResourceARN: r.ProtectionGroupArn} output, err := svc.ListTagsForResource(ctx, &config, func(o *shield.Options) { diff --git a/plugins/source/aws/resources/services/shield/protections.go b/plugins/source/aws/resources/services/shield/protections.go index 81f98c6eb1fb3b..fe4828b8cb443c 100644 --- a/plugins/source/aws/resources/services/shield/protections.go +++ b/plugins/source/aws/resources/services/shield/protections.go @@ -40,7 +40,7 @@ func Protections() *schema.Table { func fetchShieldProtections(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield config := shield.ListProtectionsInput{} paginator := shield.NewListProtectionsPaginator(svc, &config) for paginator.HasMorePages() { @@ -61,7 +61,7 @@ func fetchShieldProtections(ctx context.Context, meta schema.ClientMeta, parent func resolveShieldProtectionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { r := resource.Item.(types.Protection) cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield config := shield.ListTagsForResourceInput{ResourceARN: r.ProtectionArn} output, err := svc.ListTagsForResource(ctx, &config, func(o *shield.Options) { diff --git a/plugins/source/aws/resources/services/shield/subscriptions.go b/plugins/source/aws/resources/services/shield/subscriptions.go index 1cc5fd10dfe771..082b21393a7cf7 100644 --- a/plugins/source/aws/resources/services/shield/subscriptions.go +++ b/plugins/source/aws/resources/services/shield/subscriptions.go @@ -33,7 +33,7 @@ func Subscriptions() *schema.Table { func fetchShieldSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Shield + svc := cl.Services(client.AWSServiceShield).Shield config := shield.DescribeSubscriptionInput{} output, err := svc.DescribeSubscription(ctx, &config, func(o *shield.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/signer/profiles.go b/plugins/source/aws/resources/services/signer/profiles.go index bbbbb8253f96b8..bef52017cef5d0 100644 --- a/plugins/source/aws/resources/services/signer/profiles.go +++ b/plugins/source/aws/resources/services/signer/profiles.go @@ -28,7 +28,7 @@ func Profiles() *schema.Table { func fetchProfiles(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Signer + svc := cl.Services(client.AWSServiceSigner).Signer config := signer.ListSigningProfilesInput{} paginator := signer.NewListSigningProfilesPaginator(svc, &config) @@ -46,7 +46,7 @@ func fetchProfiles(ctx context.Context, meta schema.ClientMeta, parent *schema.R func getProfile(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Signer + svc := cl.Services(client.AWSServiceSigner).Signer a := resource.Item.(types.SigningProfile) profile, err := svc.GetSigningProfile(ctx, &signer.GetSigningProfileInput{ProfileName: a.ProfileName}, func(o *signer.Options) { diff --git a/plugins/source/aws/resources/services/sns/subscriptions.go b/plugins/source/aws/resources/services/sns/subscriptions.go index 32cd405d728a54..e5f88bdec4e9e4 100644 --- a/plugins/source/aws/resources/services/sns/subscriptions.go +++ b/plugins/source/aws/resources/services/sns/subscriptions.go @@ -60,7 +60,7 @@ func Subscriptions() *schema.Table { func fetchSnsSubscriptions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sns + svc := cl.Services(client.AWSServiceSns).Sns config := sns.ListSubscriptionsInput{} paginator := sns.NewListSubscriptionsPaginator(svc, &config) for paginator.HasMorePages() { @@ -77,7 +77,7 @@ func fetchSnsSubscriptions(ctx context.Context, meta schema.ClientMeta, parent * func getSnsSubscription(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sns + svc := cl.Services(client.AWSServiceSns).Sns item := resource.Item.(types.Subscription) s := models.Subscription{ SubscriptionArn: item.SubscriptionArn, diff --git a/plugins/source/aws/resources/services/sns/topics.go b/plugins/source/aws/resources/services/sns/topics.go index b7b393eccab0ed..c71ab64ff6740d 100644 --- a/plugins/source/aws/resources/services/sns/topics.go +++ b/plugins/source/aws/resources/services/sns/topics.go @@ -59,7 +59,7 @@ func Topics() *schema.Table { func fetchSnsTopics(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sns + svc := cl.Services(client.AWSServiceSns).Sns config := sns.ListTopicsInput{} paginator := sns.NewListTopicsPaginator(svc, &config) for paginator.HasMorePages() { @@ -76,7 +76,7 @@ func fetchSnsTopics(ctx context.Context, meta schema.ClientMeta, parent *schema. func getTopic(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sns + svc := cl.Services(client.AWSServiceSns).Sns topic := resource.Item.(types.Topic) attrs, err := svc.GetTopicAttributes(ctx, @@ -105,7 +105,7 @@ func getTopic(ctx context.Context, meta schema.ClientMeta, resource *schema.Reso func resolveSnsTopicTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { topic := resource.Item.(*models.Topic) cl := meta.(*client.Client) - svc := cl.Services().Sns + svc := cl.Services(client.AWSServiceSns).Sns tagParams := sns.ListTagsForResourceInput{ ResourceArn: topic.Arn, } diff --git a/plugins/source/aws/resources/services/sqs/queues.go b/plugins/source/aws/resources/services/sqs/queues.go index bada32c17708fa..3b52546a58b5e3 100644 --- a/plugins/source/aws/resources/services/sqs/queues.go +++ b/plugins/source/aws/resources/services/sqs/queues.go @@ -60,7 +60,7 @@ func Queues() *schema.Table { func fetchSqsQueues(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sqs + svc := cl.Services(client.AWSServiceSqs).Sqs var params sqs.ListQueuesInput paginator := sqs.NewListQueuesPaginator(svc, ¶ms) for paginator.HasMorePages() { @@ -77,7 +77,7 @@ func fetchSqsQueues(ctx context.Context, meta schema.ClientMeta, parent *schema. func getQueue(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sqs + svc := cl.Services(client.AWSServiceSqs).Sqs qURL := resource.Item.(string) input := sqs.GetQueueAttributesInput{ @@ -106,7 +106,7 @@ func getQueue(ctx context.Context, meta schema.ClientMeta, resource *schema.Reso func resolveSqsQueueTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Sqs + svc := cl.Services(client.AWSServiceSqs).Sqs q := resource.Item.(*models.Queue) result, err := svc.ListQueueTags(ctx, &sqs.ListQueueTagsInput{QueueUrl: &q.URL}, func(o *sqs.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/ssm/associations.go b/plugins/source/aws/resources/services/ssm/associations.go index d71abcdfe48c61..0586ca2f10917f 100644 --- a/plugins/source/aws/resources/services/ssm/associations.go +++ b/plugins/source/aws/resources/services/ssm/associations.go @@ -34,7 +34,7 @@ func Associations() *schema.Table { func fetchSsmAssociations(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewListAssociationsPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ssm/compliance_summary_items.go b/plugins/source/aws/resources/services/ssm/compliance_summary_items.go index 207b43acae569a..3436a14f3a8c0d 100644 --- a/plugins/source/aws/resources/services/ssm/compliance_summary_items.go +++ b/plugins/source/aws/resources/services/ssm/compliance_summary_items.go @@ -34,7 +34,7 @@ func ComplianceSummaryItems() *schema.Table { func fetchSsmComplianceSummaryItems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm params := ssm.ListComplianceSummariesInput{ MaxResults: aws.Int32(50), diff --git a/plugins/source/aws/resources/services/ssm/document_versions.go b/plugins/source/aws/resources/services/ssm/document_versions.go index a1595572d1bc44..efcef8e6effaf1 100644 --- a/plugins/source/aws/resources/services/ssm/document_versions.go +++ b/plugins/source/aws/resources/services/ssm/document_versions.go @@ -34,7 +34,7 @@ func documentVersions() *schema.Table { func fetchSsmDocumentVersions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm item := parent.Item.(*types.DocumentDescription) params := ssm.ListDocumentVersionsInput{ diff --git a/plugins/source/aws/resources/services/ssm/documents.go b/plugins/source/aws/resources/services/ssm/documents.go index 83558d3a0aece6..fa758555e8647d 100644 --- a/plugins/source/aws/resources/services/ssm/documents.go +++ b/plugins/source/aws/resources/services/ssm/documents.go @@ -53,7 +53,7 @@ func Documents() *schema.Table { func fetchSsmDocuments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm params := ssm.ListDocumentsInput{ Filters: []types.DocumentKeyValuesFilter{{Key: aws.String("Owner"), Values: []string{"Self"}}}, @@ -73,7 +73,7 @@ func fetchSsmDocuments(ctx context.Context, meta schema.ClientMeta, parent *sche func getDocument(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm d := resource.Item.(types.DocumentIdentifier) dd, err := svc.DescribeDocument(ctx, &ssm.DescribeDocumentInput{Name: d.Name}, func(o *ssm.Options) { @@ -90,7 +90,7 @@ func getDocument(ctx context.Context, meta schema.ClientMeta, resource *schema.R func resolveDocumentPermission(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, col schema.Column) (exitErr error) { d := resource.Item.(*types.DocumentDescription) cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm input := ssm.DescribeDocumentPermissionInput{ Name: d.Name, diff --git a/plugins/source/aws/resources/services/ssm/instance_compliance_items.go b/plugins/source/aws/resources/services/ssm/instance_compliance_items.go index 649dd72ef55789..8f09f7696b39ef 100644 --- a/plugins/source/aws/resources/services/ssm/instance_compliance_items.go +++ b/plugins/source/aws/resources/services/ssm/instance_compliance_items.go @@ -40,7 +40,7 @@ func instanceComplianceItems() *schema.Table { func fetchSsmInstanceComplianceItems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { instance := parent.Item.(types.InstanceInformation) cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm input := ssm.ListComplianceItemsInput{ ResourceIds: []string{*instance.InstanceId}, diff --git a/plugins/source/aws/resources/services/ssm/instance_patches.go b/plugins/source/aws/resources/services/ssm/instance_patches.go index 809025194d1303..d581a80a2ced5f 100644 --- a/plugins/source/aws/resources/services/ssm/instance_patches.go +++ b/plugins/source/aws/resources/services/ssm/instance_patches.go @@ -39,7 +39,7 @@ func instancePatches() *schema.Table { func fetchSsmInstancePatches(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm item := parent.Item.(types.InstanceInformation) paginator := ssm.NewDescribeInstancePatchesPaginator(svc, &ssm.DescribeInstancePatchesInput{ diff --git a/plugins/source/aws/resources/services/ssm/instances.go b/plugins/source/aws/resources/services/ssm/instances.go index d834ba6bee5201..8fcc86546461cb 100644 --- a/plugins/source/aws/resources/services/ssm/instances.go +++ b/plugins/source/aws/resources/services/ssm/instances.go @@ -42,7 +42,7 @@ func Instances() *schema.Table { func fetchSsmInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewDescribeInstanceInformationPaginator(svc, &ssm.DescribeInstanceInformationInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *ssm.Options) { diff --git a/plugins/source/aws/resources/services/ssm/inventories.go b/plugins/source/aws/resources/services/ssm/inventories.go index dc9d469ef90bd8..a10b3e09a59538 100644 --- a/plugins/source/aws/resources/services/ssm/inventories.go +++ b/plugins/source/aws/resources/services/ssm/inventories.go @@ -34,7 +34,7 @@ func Inventories() *schema.Table { func fetchSsmInventories(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewGetInventoryPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ssm/inventory_schemas.go b/plugins/source/aws/resources/services/ssm/inventory_schemas.go index f78fc3f9160a58..a71ebfb964c29e 100644 --- a/plugins/source/aws/resources/services/ssm/inventory_schemas.go +++ b/plugins/source/aws/resources/services/ssm/inventory_schemas.go @@ -40,7 +40,7 @@ func InventorySchemas() *schema.Table { func fetchSsmInventorySchemas(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewGetInventorySchemaPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ssm/parameters.go b/plugins/source/aws/resources/services/ssm/parameters.go index 8e74cc54c747ec..d20595bf227ab0 100644 --- a/plugins/source/aws/resources/services/ssm/parameters.go +++ b/plugins/source/aws/resources/services/ssm/parameters.go @@ -34,7 +34,7 @@ func Parameters() *schema.Table { func fetchSsmParameters(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewDescribeParametersPaginator(svc, &ssm.DescribeParametersInput{}) for paginator.HasMorePages() { page, err := paginator.NextPage(ctx, func(o *ssm.Options) { diff --git a/plugins/source/aws/resources/services/ssm/patch_baselines.go b/plugins/source/aws/resources/services/ssm/patch_baselines.go index 23b032cd957eb4..84f28eb2d8d4ab 100644 --- a/plugins/source/aws/resources/services/ssm/patch_baselines.go +++ b/plugins/source/aws/resources/services/ssm/patch_baselines.go @@ -34,7 +34,7 @@ func PatchBaselines() *schema.Table { func fetchSsmPatchBaselines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm paginator := ssm.NewDescribePatchBaselinesPaginator(svc, nil) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ssm/sessions.go b/plugins/source/aws/resources/services/ssm/sessions.go index 45141165570e7b..f77d68b15ba201 100644 --- a/plugins/source/aws/resources/services/ssm/sessions.go +++ b/plugins/source/aws/resources/services/ssm/sessions.go @@ -29,7 +29,7 @@ Only Active sessions are fetched.`, func fetchSsmSessions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssm + svc := cl.Services(client.AWSServiceSsm).Ssm params := ssm.DescribeSessionsInput{ State: types.SessionStateActive, diff --git a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go index ea484be3954747..ed1cf32c26079f 100644 --- a/plugins/source/aws/resources/services/ssoadmin/account_assignments.go +++ b/plugins/source/aws/resources/services/ssoadmin/account_assignments.go @@ -43,7 +43,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func fetchSsoadminAccountAssignments(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin configListAccountForPPS := ssoadmin.ListAccountsForProvisionedPermissionSetInput{ InstanceArn: parent.Parent.Item.(types.InstanceMetadata).InstanceArn, PermissionSetArn: parent.Item.(*types.PermissionSet).PermissionSetArn, diff --git a/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go b/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go index 058c43579b5525..9fc76dcd889d03 100644 --- a/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/customer_managed_policies.go @@ -37,7 +37,7 @@ func customerManagedPolicies() *schema.Table { func fetchCustomerManagedPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin permissionSetARN := parent.Item.(*types.PermissionSet).PermissionSetArn instanceARN := parent.Parent.Item.(types.InstanceMetadata).InstanceArn diff --git a/plugins/source/aws/resources/services/ssoadmin/inline_policies.go b/plugins/source/aws/resources/services/ssoadmin/inline_policies.go index 8e944fe4ca03fc..7ab8ad61f486fb 100644 --- a/plugins/source/aws/resources/services/ssoadmin/inline_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/inline_policies.go @@ -45,7 +45,7 @@ func inlinePolicies() *schema.Table { func fetchInlinePolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin permissionSetARN := parent.Item.(*types.PermissionSet).PermissionSetArn instanceARN := parent.Parent.Item.(types.InstanceMetadata).InstanceArn diff --git a/plugins/source/aws/resources/services/ssoadmin/instances.go b/plugins/source/aws/resources/services/ssoadmin/instances.go index 82d550d6b1bd38..252432f0f58286 100644 --- a/plugins/source/aws/resources/services/ssoadmin/instances.go +++ b/plugins/source/aws/resources/services/ssoadmin/instances.go @@ -27,7 +27,7 @@ func Instances() *schema.Table { func fetchSsoadminInstances(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin config := ssoadmin.ListInstancesInput{} paginator := ssoadmin.NewListInstancesPaginator(svc, &config) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/ssoadmin/managed_policies.go b/plugins/source/aws/resources/services/ssoadmin/managed_policies.go index f5217b1ee718c0..dee76dfd4170fb 100644 --- a/plugins/source/aws/resources/services/ssoadmin/managed_policies.go +++ b/plugins/source/aws/resources/services/ssoadmin/managed_policies.go @@ -37,7 +37,7 @@ func managedPolicies() *schema.Table { func fetchManagedPolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin permissionSetARN := parent.Item.(*types.PermissionSet).PermissionSetArn instanceARN := parent.Parent.Item.(types.InstanceMetadata).InstanceArn diff --git a/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go b/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go index c59359db4e5b8b..f9a12dbd0c83cf 100644 --- a/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go +++ b/plugins/source/aws/resources/services/ssoadmin/permission_boundaries.go @@ -37,7 +37,7 @@ func permissionsBoundaries() *schema.Table { func fetchPermissionBoundaries(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin permissionSetARN := parent.Item.(*types.PermissionSet).PermissionSetArn instanceARN := parent.Parent.Item.(types.InstanceMetadata).InstanceArn diff --git a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go index 5881334fcaa1ea..c6d19478db78f1 100644 --- a/plugins/source/aws/resources/services/ssoadmin/permission_sets.go +++ b/plugins/source/aws/resources/services/ssoadmin/permission_sets.go @@ -52,7 +52,7 @@ The 'request_account_id' and 'request_region' columns are added to show the acco func getSsoadminPermissionSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin permission_set_arn := resource.Item.(string) instance_arn := resource.Parent.Item.(types.InstanceMetadata).InstanceArn config := ssoadmin.DescribePermissionSetInput{ @@ -72,7 +72,7 @@ func getSsoadminPermissionSet(ctx context.Context, meta schema.ClientMeta, resou func fetchSsoadminPermissionSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Ssoadmin + svc := cl.Services(client.AWSServiceSsoadmin).Ssoadmin instance_arn := parent.Item.(types.InstanceMetadata).InstanceArn config := ssoadmin.ListPermissionSetsInput{ InstanceArn: instance_arn, diff --git a/plugins/source/aws/resources/services/stepfunctions/activities.go b/plugins/source/aws/resources/services/stepfunctions/activities.go index c751ad9695f9d1..7e7bd652f8de15 100644 --- a/plugins/source/aws/resources/services/stepfunctions/activities.go +++ b/plugins/source/aws/resources/services/stepfunctions/activities.go @@ -34,7 +34,7 @@ func Activities() *schema.Table { func fetchStepfunctionsActivities(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn config := sfn.ListActivitiesInput{ MaxResults: 1000, } diff --git a/plugins/source/aws/resources/services/stepfunctions/executions.go b/plugins/source/aws/resources/services/stepfunctions/executions.go index ad39275dc8c2fa..9a8b7eb7bd250e 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions.go @@ -42,7 +42,7 @@ func executions() *schema.Table { func fetchStepfunctionsExecutions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn sfnOutput := parent.Item.(*sfn.DescribeStateMachineOutput) config := sfn.ListExecutionsInput{ MaxResults: 1000, @@ -65,7 +65,7 @@ func getExecution(ctx context.Context, meta schema.ClientMeta, resource *schema. execution := resource.Item.(types.ExecutionListItem) cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn executionResult, err := svc.DescribeExecution(ctx, &sfn.DescribeExecutionInput{ ExecutionArn: execution.ExecutionArn, diff --git a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go index 0d8093bc0c983f..6923cbfb982ec9 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs.go @@ -42,7 +42,7 @@ func mapRuns() *schema.Table { func fetchStepfunctionsMapRuns(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn config := sfn.ListMapRunsInput{ MaxResults: 1000, ExecutionArn: parent.Item.(*sfn.DescribeExecutionOutput).ExecutionArn, @@ -62,7 +62,7 @@ func fetchStepfunctionsMapRuns(ctx context.Context, meta schema.ClientMeta, pare func getMapRun(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn config := sfn.DescribeMapRunInput{ MapRunArn: resource.Item.(types.MapRunListItem).MapRunArn, } diff --git a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go index 16f0b44c294d28..4674aa0010c17b 100644 --- a/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go +++ b/plugins/source/aws/resources/services/stepfunctions/executions_map_runs_executions.go @@ -43,7 +43,7 @@ func mapRunExecutions() *schema.Table { func fetchStepfunctionsMapRunExecutions(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn config := sfn.ListExecutionsInput{ MaxResults: 1000, MapRunArn: parent.Item.(*sfn.DescribeMapRunOutput).MapRunArn, diff --git a/plugins/source/aws/resources/services/stepfunctions/state_machines.go b/plugins/source/aws/resources/services/stepfunctions/state_machines.go index 62e592e57a1513..375c6d40690759 100644 --- a/plugins/source/aws/resources/services/stepfunctions/state_machines.go +++ b/plugins/source/aws/resources/services/stepfunctions/state_machines.go @@ -45,7 +45,7 @@ func StateMachines() *schema.Table { func fetchStepfunctionsStateMachines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn config := sfn.ListStateMachinesInput{} paginator := sfn.NewListStateMachinesPaginator(svc, &config) for paginator.HasMorePages() { @@ -62,7 +62,7 @@ func fetchStepfunctionsStateMachines(ctx context.Context, meta schema.ClientMeta func getStepFunction(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn sm := resource.Item.(types.StateMachineListItem) stateMachineDetails, err := svc.DescribeStateMachine(ctx, @@ -82,7 +82,7 @@ func getStepFunction(ctx context.Context, meta schema.ClientMeta, resource *sche func resolveStepFunctionTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { sm := resource.Item.(*sfn.DescribeStateMachineOutput) cl := meta.(*client.Client) - svc := cl.Services().Sfn + svc := cl.Services(client.AWSServiceSfn).Sfn tagParams := sfn.ListTagsForResourceInput{ ResourceArn: sm.StateMachineArn, } diff --git a/plugins/source/aws/resources/services/support/cases.go b/plugins/source/aws/resources/services/support/cases.go index df31b9f67524c6..7a8e27f7329c83 100644 --- a/plugins/source/aws/resources/services/support/cases.go +++ b/plugins/source/aws/resources/services/support/cases.go @@ -29,7 +29,7 @@ func Cases() *schema.Table { func fetchCases(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support input := support.DescribeCasesInput{MaxResults: aws.Int32(100), IncludeResolvedCases: true} paginator := support.NewDescribeCasesPaginator(svc, &input) diff --git a/plugins/source/aws/resources/services/support/communications.go b/plugins/source/aws/resources/services/support/communications.go index fa2b542103ad52..3b2e7bc5398faa 100644 --- a/plugins/source/aws/resources/services/support/communications.go +++ b/plugins/source/aws/resources/services/support/communications.go @@ -28,7 +28,7 @@ func communications() *schema.Table { func fetchCommunications(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support p := parent.Item.(types.CaseDetails) input := support.DescribeCommunicationsInput{MaxResults: aws.Int32(100), CaseId: p.CaseId} diff --git a/plugins/source/aws/resources/services/support/services.go b/plugins/source/aws/resources/services/support/services.go index c7a5177febe0c6..fb4f10804a485b 100644 --- a/plugins/source/aws/resources/services/support/services.go +++ b/plugins/source/aws/resources/services/support/services.go @@ -31,7 +31,7 @@ func Services() *schema.Table { func fetchServices(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support input := support.DescribeServicesInput{Language: aws.String(cl.LanguageCode)} response, err := svc.DescribeServices(ctx, &input, func(o *support.Options) { diff --git a/plugins/source/aws/resources/services/support/severity_levels.go b/plugins/source/aws/resources/services/support/severity_levels.go index ae6d3562e92559..82ea8fbd2fa122 100644 --- a/plugins/source/aws/resources/services/support/severity_levels.go +++ b/plugins/source/aws/resources/services/support/severity_levels.go @@ -32,7 +32,7 @@ func SeverityLevels() *schema.Table { func fetchSeverityLevels(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support input := support.DescribeSeverityLevelsInput{Language: aws.String(cl.LanguageCode)} response, err := svc.DescribeSeverityLevels(ctx, &input, func(o *support.Options) { diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go b/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go index 8935738510083b..efd80d1313a287 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_check_results.go @@ -33,7 +33,7 @@ func fetchTrustedAdvisorCheckResults(ctx context.Context, meta schema.ClientMeta if cl.LanguageCode != "en" { return nil } - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support check := parent.Item.(types.TrustedAdvisorCheckDescription) input := support.DescribeTrustedAdvisorCheckResultInput{CheckId: check.Id} diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go b/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go index 775ddc465f00c6..51879699e433b8 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_check_summaries.go @@ -33,7 +33,7 @@ func fetchTrustedAdvisorCheckSummaries(ctx context.Context, meta schema.ClientMe if cl.LanguageCode != "en" { return nil } - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support check := parent.Item.(types.TrustedAdvisorCheckDescription) input := support.DescribeTrustedAdvisorCheckSummariesInput{CheckIds: []*string{check.Id}} diff --git a/plugins/source/aws/resources/services/support/trusted_advisor_checks.go b/plugins/source/aws/resources/services/support/trusted_advisor_checks.go index cde8c3a79a4fb8..4eb39cbd9428f3 100644 --- a/plugins/source/aws/resources/services/support/trusted_advisor_checks.go +++ b/plugins/source/aws/resources/services/support/trusted_advisor_checks.go @@ -32,7 +32,7 @@ func TrustedAdvisorChecks() *schema.Table { func fetchTrustedAdvisorChecks(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Support + svc := cl.Services(client.AWSServiceSupport).Support input := support.DescribeTrustedAdvisorChecksInput{Language: aws.String(cl.LanguageCode)} response, err := svc.DescribeTrustedAdvisorChecks(ctx, &input, func(o *support.Options) { diff --git a/plugins/source/aws/resources/services/timestream/databases.go b/plugins/source/aws/resources/services/timestream/databases.go index e86383e1670ddd..9abf61cb1d1310 100644 --- a/plugins/source/aws/resources/services/timestream/databases.go +++ b/plugins/source/aws/resources/services/timestream/databases.go @@ -46,7 +46,7 @@ func Databases() *schema.Table { func fetchTimestreamDatabases(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Timestreamwrite + svc := cl.Services(client.AWSServiceTimestreamwrite).Timestreamwrite // This should be removed once https://github.com/aws/aws-sdk-go-v2/issues/2163 is fixed if cl.AWSConfig != nil && cl.AWSConfig.Region != cl.Region { awsCfg := cl.AWSConfig.Copy() @@ -69,7 +69,7 @@ func fetchTimestreamDatabases(ctx context.Context, meta schema.ClientMeta, _ *sc func fetchDatabaseTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Timestreamwrite + svc := cl.Services(client.AWSServiceTimestreamwrite).Timestreamwrite output, err := svc.ListTagsForResource(ctx, ×treamwrite.ListTagsForResourceInput{ diff --git a/plugins/source/aws/resources/services/timestream/tables.go b/plugins/source/aws/resources/services/timestream/tables.go index cb28d9be23480b..b1830027c32922 100644 --- a/plugins/source/aws/resources/services/timestream/tables.go +++ b/plugins/source/aws/resources/services/timestream/tables.go @@ -37,7 +37,7 @@ func fetchTimestreamTables(ctx context.Context, meta schema.ClientMeta, parent * DatabaseName: parent.Item.(types.Database).DatabaseName, MaxResults: aws.Int32(20), } - paginator := timestreamwrite.NewListTablesPaginator(cl.Services().Timestreamwrite, input) + paginator := timestreamwrite.NewListTablesPaginator(cl.Services(client.AWSServiceTimestreamwrite).Timestreamwrite, input) for paginator.HasMorePages() { response, err := paginator.NextPage(ctx, func(o *timestreamwrite.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/transfer/servers.go b/plugins/source/aws/resources/services/transfer/servers.go index 9e2df45b2a9bb9..29e6f436ba3430 100644 --- a/plugins/source/aws/resources/services/transfer/servers.go +++ b/plugins/source/aws/resources/services/transfer/servers.go @@ -43,7 +43,7 @@ func Servers() *schema.Table { } func fetchTransferServers(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Transfer + svc := cl.Services(client.AWSServiceTransfer).Transfer input := transfer.ListServersInput{MaxResults: aws.Int32(1000)} paginator := transfer.NewListServersPaginator(svc, &input) for paginator.HasMorePages() { @@ -60,7 +60,7 @@ func fetchTransferServers(ctx context.Context, meta schema.ClientMeta, parent *s func getServer(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Transfer + svc := cl.Services(client.AWSServiceTransfer).Transfer server := resource.Item.(types.ListedServer) desc, err := svc.DescribeServer(ctx, &transfer.DescribeServerInput{ServerId: server.ServerId}, func(o *transfer.Options) { @@ -75,7 +75,7 @@ func getServer(ctx context.Context, meta schema.ClientMeta, resource *schema.Res func resolveServersTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Transfer + svc := cl.Services(client.AWSServiceTransfer).Transfer server := resource.Item.(*types.DescribedServer) input := transfer.ListTagsForResourceInput{Arn: server.Arn} var tags []types.Tag diff --git a/plugins/source/aws/resources/services/waf/rule_groups.go b/plugins/source/aws/resources/services/waf/rule_groups.go index 6ce7335dfd8208..17831eec9fb34f 100644 --- a/plugins/source/aws/resources/services/waf/rule_groups.go +++ b/plugins/source/aws/resources/services/waf/rule_groups.go @@ -48,7 +48,7 @@ func RuleGroups() *schema.Table { func fetchWafRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf config := waf.ListRuleGroupsInput{} for { output, err := service.ListRuleGroups(ctx, &config, func(o *waf.Options) { @@ -90,7 +90,7 @@ func resolveWafRuleGroupRuleIds(ctx context.Context, meta schema.ClientMeta, res // Resolves rule group rules cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf listActivatedRulesConfig := waf.ListActivatedRulesInRuleGroupInput{RuleGroupId: ruleGroup.RuleGroupId} var ruleIDs []string for { @@ -116,7 +116,7 @@ func resolveWafRuleGroupTags(ctx context.Context, meta schema.ClientMeta, resour // Resolve tags for resource cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf // Generate arn arnStr := arn.ARN{ diff --git a/plugins/source/aws/resources/services/waf/rules.go b/plugins/source/aws/resources/services/waf/rules.go index f178d64e498364..2fa84b340cb865 100644 --- a/plugins/source/aws/resources/services/waf/rules.go +++ b/plugins/source/aws/resources/services/waf/rules.go @@ -43,7 +43,7 @@ func Rules() *schema.Table { func fetchWafRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf config := waf.ListRulesInput{} for { output, err := service.ListRules(ctx, &config, func(o *waf.Options) { @@ -87,7 +87,7 @@ func resolveWafRuleTags(ctx context.Context, meta schema.ClientMeta, resource *s // Resolve tags for resource cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf // Generate arn arnStr := arn.ARN{ diff --git a/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go b/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go index 4c2244afc77f92..6f33b35f54cb61 100644 --- a/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go +++ b/plugins/source/aws/resources/services/waf/subscribed_rule_groups.go @@ -41,7 +41,7 @@ func SubscribedRuleGroups() *schema.Table { func fetchWafSubscribedRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf config := waf.ListSubscribedRuleGroupsInput{} for { output, err := service.ListSubscribedRuleGroups(ctx, &config, func(o *waf.Options) { diff --git a/plugins/source/aws/resources/services/waf/web_acls.go b/plugins/source/aws/resources/services/waf/web_acls.go index 60755281a64067..ef3df8f481dc41 100644 --- a/plugins/source/aws/resources/services/waf/web_acls.go +++ b/plugins/source/aws/resources/services/waf/web_acls.go @@ -46,7 +46,7 @@ type WebACLWrapper struct { func fetchWafWebAcls(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf config := waf.ListWebACLsInput{} for { output, err := service.ListWebACLs(ctx, &config, func(o *waf.Options) { @@ -98,7 +98,7 @@ func resolveWafWebACLTags(ctx context.Context, meta schema.ClientMeta, resource // Resolve tags for resource cl := meta.(*client.Client) - service := cl.Services().Waf + service := cl.Services(client.AWSServiceWaf).Waf outputTags := make(map[string]*string) tagsConfig := waf.ListTagsForResourceInput{ResourceARN: webACL.WebACLArn} for { diff --git a/plugins/source/aws/resources/services/wafregional/rate_based_rules.go b/plugins/source/aws/resources/services/wafregional/rate_based_rules.go index 0c0e7c5503bc44..83b7ac25aaf0e1 100644 --- a/plugins/source/aws/resources/services/wafregional/rate_based_rules.go +++ b/plugins/source/aws/resources/services/wafregional/rate_based_rules.go @@ -44,7 +44,7 @@ func RateBasedRules() *schema.Table { func fetchWafregionalRateBasedRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional var params wafregional.ListRateBasedRulesInput for { result, err := svc.ListRateBasedRules(ctx, ¶ms, func(o *wafregional.Options) { @@ -81,7 +81,7 @@ func resolveWafregionalRateBasedRuleArn(ctx context.Context, meta schema.ClientM } func resolveWafregionalRateBasedRuleTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional arnStr := rateBasedRuleARN(meta, *resource.Item.(types.RateBasedRule).RuleId) params := wafregional.ListTagsForResourceInput{ResourceARN: &arnStr} tags := make(map[string]string) diff --git a/plugins/source/aws/resources/services/wafregional/rule_groups.go b/plugins/source/aws/resources/services/wafregional/rule_groups.go index 914c6ec2871bc0..20b81b49048e73 100644 --- a/plugins/source/aws/resources/services/wafregional/rule_groups.go +++ b/plugins/source/aws/resources/services/wafregional/rule_groups.go @@ -50,7 +50,7 @@ func RuleGroups() *schema.Table { func fetchWafregionalRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional var params wafregional.ListRuleGroupsInput for { result, err := svc.ListRuleGroups(ctx, ¶ms, func(o *wafregional.Options) { @@ -92,7 +92,7 @@ func resolveWafregionalRuleGroupRuleIds(ctx context.Context, meta schema.ClientM // Resolves rule group rules cl := meta.(*client.Client) - service := cl.Services().Wafregional + service := cl.Services(client.AWSServiceWafregional).Wafregional listActivatedRulesConfig := wafregional.ListActivatedRulesInRuleGroupInput{RuleGroupId: ruleGroup.RuleGroupId} var ruleIDs []string for { @@ -116,7 +116,7 @@ func resolveWafregionalRuleGroupRuleIds(ctx context.Context, meta schema.ClientM func resolveWafregionalRuleGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional arnStr := ruleGroupARN(meta, *resource.Item.(types.RuleGroup).RuleGroupId) params := wafregional.ListTagsForResourceInput{ResourceARN: &arnStr} tags := make(map[string]string) diff --git a/plugins/source/aws/resources/services/wafregional/rules.go b/plugins/source/aws/resources/services/wafregional/rules.go index b22fba1b789ae5..a8bc6d694fd0da 100644 --- a/plugins/source/aws/resources/services/wafregional/rules.go +++ b/plugins/source/aws/resources/services/wafregional/rules.go @@ -45,7 +45,7 @@ func Rules() *schema.Table { func fetchWafregionalRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional var params wafregional.ListRulesInput for { result, err := svc.ListRules(ctx, ¶ms, func(o *wafregional.Options) { @@ -84,7 +84,7 @@ func resolveWafregionalRuleArn(ctx context.Context, meta schema.ClientMeta, reso func resolveWafregionalRuleTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional arnStr := ruleARN(meta, *resource.Item.(types.Rule).RuleId) params := wafregional.ListTagsForResourceInput{ResourceARN: &arnStr} tags := make(map[string]string) diff --git a/plugins/source/aws/resources/services/wafregional/web_acls.go b/plugins/source/aws/resources/services/wafregional/web_acls.go index c002c284e2a56e..b755bbc79bcd14 100644 --- a/plugins/source/aws/resources/services/wafregional/web_acls.go +++ b/plugins/source/aws/resources/services/wafregional/web_acls.go @@ -48,7 +48,7 @@ func WebAcls() *schema.Table { func fetchWafregionalWebAcls(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional var params wafregional.ListWebACLsInput for { result, err := svc.ListWebACLs(ctx, ¶ms, func(o *wafregional.Options) { @@ -82,7 +82,7 @@ func fetchWafregionalWebAcls(ctx context.Context, meta schema.ClientMeta, parent } func resolveWafregionalWebACLTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafregional + svc := cl.Services(client.AWSServiceWafregional).Wafregional params := wafregional.ListTagsForResourceInput{ResourceARN: resource.Item.(types.WebACL).WebACLArn} tags := make(map[string]string) for { @@ -105,7 +105,7 @@ func resolveWafregionalWebACLTags(ctx context.Context, meta schema.ClientMeta, r func resolveWafregionalWebACLResourcesForWebACL(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - service := cl.Services().Wafregional + service := cl.Services(client.AWSServiceWafregional).Wafregional output, err := service.ListResourcesForWebACL(ctx, &wafregional.ListResourcesForWebACLInput{ WebACLId: resource.Item.(types.WebACL).WebACLId, }, func(o *wafregional.Options) { diff --git a/plugins/source/aws/resources/services/wafv2/ipsets.go b/plugins/source/aws/resources/services/wafv2/ipsets.go index add98620a51f76..ebe275ed371c04 100644 --- a/plugins/source/aws/resources/services/wafv2/ipsets.go +++ b/plugins/source/aws/resources/services/wafv2/ipsets.go @@ -49,7 +49,7 @@ func Ipsets() *schema.Table { func fetchWafv2Ipsets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 params := wafv2.ListIPSetsInput{ Scope: cl.WAFScope, @@ -74,7 +74,7 @@ func fetchWafv2Ipsets(ctx context.Context, meta schema.ClientMeta, parent *schem func getIpset(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 s := resource.Item.(types.IPSetSummary) input := &wafv2.GetIPSetInput{ Id: s.Id, Name: s.Name, Scope: cl.WAFScope, @@ -105,7 +105,7 @@ func resolveIpsetAddresses(ctx context.Context, meta schema.ClientMeta, resource func resolveIpsetTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 s := resource.Item.(*types.IPSet) var tagList []types.Tag params := wafv2.ListTagsForResourceInput{ResourceARN: s.ARN} diff --git a/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go b/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go index 2eb191cc5f7b61..ced7c76d46e293 100644 --- a/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/managed_rule_groups.go @@ -42,7 +42,7 @@ func ManagedRuleGroups() *schema.Table { func fetchWafv2ManagedRuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 config := wafv2.ListAvailableManagedRuleGroupsInput{Scope: cl.WAFScope} for { @@ -65,7 +65,7 @@ func resolveManageRuleGroupProperties(ctx context.Context, meta schema.ClientMet managedRuleGroupSum := resource.Item.(types.ManagedRuleGroupSummary) cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 // Resolve managed rule group via describe managed rule group output, err := service.DescribeManagedRuleGroup(ctx, &wafv2.DescribeManagedRuleGroupInput{ diff --git a/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go b/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go index 721b1342f196fb..6fb8d3d65154c1 100644 --- a/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go +++ b/plugins/source/aws/resources/services/wafv2/regex_pattern_sets.go @@ -43,7 +43,7 @@ func RegexPatternSets() *schema.Table { func fetchWafv2RegexPatternSets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 params := wafv2.ListRegexPatternSetsInput{ Scope: cl.WAFScope, @@ -69,7 +69,7 @@ func fetchWafv2RegexPatternSets(ctx context.Context, meta schema.ClientMeta, par func getRegexPatternSet(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 s := resource.Item.(types.RegexPatternSetSummary) info, err := svc.GetRegexPatternSet( @@ -93,7 +93,7 @@ func getRegexPatternSet(ctx context.Context, meta schema.ClientMeta, resource *s func resolveRegexPatternSetTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 s := resource.Item.(*types.RegexPatternSet) tags := make(map[string]string) params := wafv2.ListTagsForResourceInput{ResourceARN: s.ARN} diff --git a/plugins/source/aws/resources/services/wafv2/rule_groups.go b/plugins/source/aws/resources/services/wafv2/rule_groups.go index 3d7abca1d8ccfd..23056550bd9f95 100644 --- a/plugins/source/aws/resources/services/wafv2/rule_groups.go +++ b/plugins/source/aws/resources/services/wafv2/rule_groups.go @@ -50,7 +50,7 @@ func RuleGroups() *schema.Table { func fetchWafv2RuleGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 config := wafv2.ListRuleGroupsInput{Scope: cl.WAFScope} for { @@ -73,7 +73,7 @@ func fetchWafv2RuleGroups(ctx context.Context, meta schema.ClientMeta, parent *s func getRuleGroup(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 ruleGroupOutput := resource.Item.(types.RuleGroupSummary) // Get RuleGroup object @@ -96,7 +96,7 @@ func resolveRuleGroupTags(ctx context.Context, meta schema.ClientMeta, resource ruleGroup := resource.Item.(*types.RuleGroup) cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 // Resolve tags outputTags := make(map[string]*string) @@ -122,7 +122,7 @@ func resolveWafv2ruleGroupPolicy(ctx context.Context, meta schema.ClientMeta, re ruleGroup := resource.Item.(*types.RuleGroup) cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 // Resolve rule group policy policy, err := service.GetPermissionPolicy(ctx, &wafv2.GetPermissionPolicyInput{ResourceArn: ruleGroup.ARN}, func(o *wafv2.Options) { diff --git a/plugins/source/aws/resources/services/wafv2/web_acls.go b/plugins/source/aws/resources/services/wafv2/web_acls.go index 439fae6281b084..8849bdc7fd3ac7 100644 --- a/plugins/source/aws/resources/services/wafv2/web_acls.go +++ b/plugins/source/aws/resources/services/wafv2/web_acls.go @@ -50,7 +50,7 @@ func WebAcls() *schema.Table { func fetchWafv2WebAcls(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 config := wafv2.ListWebACLsInput{ Scope: cl.WAFScope, @@ -76,7 +76,7 @@ func fetchWafv2WebAcls(ctx context.Context, meta schema.ClientMeta, parent *sche func getWebAcl(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - svc := cl.Services().Wafv2 + svc := cl.Services(client.AWSServiceWafv2).Wafv2 webAcl := resource.Item.(types.WebACLSummary) webAclConfig := wafv2.GetWebACLInput{Id: webAcl.Id, Name: webAcl.Name, Scope: cl.WAFScope} @@ -118,11 +118,11 @@ func resolveWafv2webACLResourcesForWebACL(ctx context.Context, meta schema.Clien webACL := resource.Item.(*models.WebACLWrapper) cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 resourceArns := []string{} if cl.WAFScope == types.ScopeCloudfront { - cloudfrontService := cl.Services().Cloudfront + cloudfrontService := cl.Services(client.AWSServiceCloudfront).Cloudfront params := &cloudfront.ListDistributionsByWebACLIdInput{ WebACLId: webACL.Id, MaxItems: aws.Int32(100), @@ -164,7 +164,7 @@ func resolveWebACLTags(ctx context.Context, meta schema.ClientMeta, resource *sc webACL := resource.Item.(*models.WebACLWrapper) cl := meta.(*client.Client) - service := cl.Services().Wafv2 + service := cl.Services(client.AWSServiceWafv2).Wafv2 // Resolve tags outputTags := make(map[string]*string) diff --git a/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go b/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go index c89d647d7e5427..cbe31e8076363c 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go +++ b/plugins/source/aws/resources/services/wellarchitected/lens_review_improvements.go @@ -58,7 +58,7 @@ func fetchLensReviewImprovements(ctx context.Context, meta schema.ClientMeta, pa } cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected milestoneNumber := int32(parent.Get("milestone_number").Get().(int64)) workloadID := parent.Get("workload_id").String() diff --git a/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go b/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go index 7bdf30de73dbe2..b65273a84135bc 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go +++ b/plugins/source/aws/resources/services/wellarchitected/lens_reviews.go @@ -47,7 +47,7 @@ func lensReviews() *schema.Table { func fetchLensReviews(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected milestoneNumber := int32(parent.Get("milestone_number").Get().(int64)) workloadID := parent.Get("workload_id").String() diff --git a/plugins/source/aws/resources/services/wellarchitected/lenses.go b/plugins/source/aws/resources/services/wellarchitected/lenses.go index 8c51d1b6fd84b0..da9b791d52ae50 100644 --- a/plugins/source/aws/resources/services/wellarchitected/lenses.go +++ b/plugins/source/aws/resources/services/wellarchitected/lenses.go @@ -44,7 +44,7 @@ func Lenses() *schema.Table { func fetchLenses(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected // we do fetch for all 3 types for _, lensType := range types.LensType("").Values() { @@ -71,7 +71,7 @@ func fetchLenses(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource func getLens(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected summary := resource.Item.(types.LensSummary) l := &lens{LensSummary: &summary} diff --git a/plugins/source/aws/resources/services/wellarchitected/share_invitations.go b/plugins/source/aws/resources/services/wellarchitected/share_invitations.go index 52767b8e575244..eed0f5993069f6 100644 --- a/plugins/source/aws/resources/services/wellarchitected/share_invitations.go +++ b/plugins/source/aws/resources/services/wellarchitected/share_invitations.go @@ -26,7 +26,7 @@ func ShareInvitations() *schema.Table { func fetchShareInvitations(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected for _, shareResourceType := range types.ShareResourceType("").Values() { p := wellarchitected.NewListShareInvitationsPaginator(service, diff --git a/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go b/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go index 065a8acae4a5d3..d5a607d7a07a71 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go +++ b/plugins/source/aws/resources/services/wellarchitected/workload_milestones.go @@ -43,7 +43,7 @@ func workloadMilestones() *schema.Table { func fetchWorkloadMilestones(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected workloadID := parent.Get("workload_id").String() p := wellarchitected.NewListMilestonesPaginator(service, diff --git a/plugins/source/aws/resources/services/wellarchitected/workload_shares.go b/plugins/source/aws/resources/services/wellarchitected/workload_shares.go index d988915c233243..de8211362cd261 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workload_shares.go +++ b/plugins/source/aws/resources/services/wellarchitected/workload_shares.go @@ -36,7 +36,7 @@ func workloadShares() *schema.Table { func fetchWorkloadShares(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected workloadID := parent.Get("workload_id").String() p := wellarchitected.NewListWorkloadSharesPaginator(service, diff --git a/plugins/source/aws/resources/services/wellarchitected/workloads.go b/plugins/source/aws/resources/services/wellarchitected/workloads.go index 3032f36661bcb7..0ad5ff8b9dfcaf 100644 --- a/plugins/source/aws/resources/services/wellarchitected/workloads.go +++ b/plugins/source/aws/resources/services/wellarchitected/workloads.go @@ -39,7 +39,7 @@ func Workloads() *schema.Table { func fetchWorkloads(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected p := wellarchitected.NewListWorkloadsPaginator(service, &wellarchitected.ListWorkloadsInput{MaxResults: 50}) for p.HasMorePages() { @@ -57,7 +57,7 @@ func fetchWorkloads(ctx context.Context, meta schema.ClientMeta, _ *schema.Resou func getWorkload(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource) error { cl := meta.(*client.Client) - service := cl.Services().Wellarchitected + service := cl.Services(client.AWSServiceWellarchitected).Wellarchitected summary := resource.Item.(types.WorkloadSummary) out, err := service.GetWorkload(ctx, diff --git a/plugins/source/aws/resources/services/workspaces/directories.go b/plugins/source/aws/resources/services/workspaces/directories.go index 19a53362f5d3e9..8d44788abaf32d 100644 --- a/plugins/source/aws/resources/services/workspaces/directories.go +++ b/plugins/source/aws/resources/services/workspaces/directories.go @@ -34,7 +34,7 @@ func Directories() *schema.Table { func fetchWorkspacesDirectories(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Workspaces + svc := cl.Services(client.AWSServiceWorkspaces).Workspaces input := workspaces.DescribeWorkspaceDirectoriesInput{} paginator := workspaces.NewDescribeWorkspaceDirectoriesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/workspaces/workspaces.go b/plugins/source/aws/resources/services/workspaces/workspaces.go index 45ed388db84f82..ba1447837295a2 100644 --- a/plugins/source/aws/resources/services/workspaces/workspaces.go +++ b/plugins/source/aws/resources/services/workspaces/workspaces.go @@ -34,7 +34,7 @@ func Workspaces() *schema.Table { func fetchWorkspacesWorkspaces(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Workspaces + svc := cl.Services(client.AWSServiceWorkspaces).Workspaces input := workspaces.DescribeWorkspacesInput{} paginator := workspaces.NewDescribeWorkspacesPaginator(svc, &input) for paginator.HasMorePages() { diff --git a/plugins/source/aws/resources/services/xray/encryption_configs.go b/plugins/source/aws/resources/services/xray/encryption_configs.go index 448a21a90d655c..ecf84706992152 100644 --- a/plugins/source/aws/resources/services/xray/encryption_configs.go +++ b/plugins/source/aws/resources/services/xray/encryption_configs.go @@ -27,7 +27,7 @@ func EncryptionConfigs() *schema.Table { func fetchXrayEncryptionConfigs(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - svc := cl.Services().Xray + svc := cl.Services(client.AWSServiceXray).Xray input := xray.GetEncryptionConfigInput{} output, err := svc.GetEncryptionConfig(ctx, &input, func(o *xray.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/xray/groups.go b/plugins/source/aws/resources/services/xray/groups.go index 0ccf2b640bc645..2bc01b178b2e1f 100644 --- a/plugins/source/aws/resources/services/xray/groups.go +++ b/plugins/source/aws/resources/services/xray/groups.go @@ -41,7 +41,7 @@ func Groups() *schema.Table { func fetchXrayGroups(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := xray.NewGetGroupsPaginator(cl.Services().Xray, nil) + paginator := xray.NewGetGroupsPaginator(cl.Services(client.AWSServiceXray).Xray, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(o *xray.Options) { o.Region = cl.Region @@ -56,7 +56,7 @@ func fetchXrayGroups(ctx context.Context, meta schema.ClientMeta, parent *schema func resolveXrayGroupTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { group := resource.Item.(types.GroupSummary) cl := meta.(*client.Client) - svc := cl.Services().Xray + svc := cl.Services(client.AWSServiceXray).Xray params := xray.ListTagsForResourceInput{ResourceARN: group.GroupARN} output, err := svc.ListTagsForResource(ctx, ¶ms, func(o *xray.Options) { diff --git a/plugins/source/aws/resources/services/xray/resource_policies.go b/plugins/source/aws/resources/services/xray/resource_policies.go index a0e4be3dfa20bb..6400e28613843f 100644 --- a/plugins/source/aws/resources/services/xray/resource_policies.go +++ b/plugins/source/aws/resources/services/xray/resource_policies.go @@ -40,7 +40,7 @@ func ResourcePolicies() *schema.Table { func fetchXrayResourcePolicies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := xray.NewListResourcePoliciesPaginator(cl.Services().Xray, nil) + paginator := xray.NewListResourcePoliciesPaginator(cl.Services(client.AWSServiceXray).Xray, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(o *xray.Options) { o.Region = cl.Region diff --git a/plugins/source/aws/resources/services/xray/sampling_rules.go b/plugins/source/aws/resources/services/xray/sampling_rules.go index 783536714c7f45..67e59c82716359 100644 --- a/plugins/source/aws/resources/services/xray/sampling_rules.go +++ b/plugins/source/aws/resources/services/xray/sampling_rules.go @@ -41,7 +41,7 @@ func SamplingRules() *schema.Table { func fetchXraySamplingRules(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error { cl := meta.(*client.Client) - paginator := xray.NewGetSamplingRulesPaginator(cl.Services().Xray, nil) + paginator := xray.NewGetSamplingRulesPaginator(cl.Services(client.AWSServiceXray).Xray, nil) for paginator.HasMorePages() { v, err := paginator.NextPage(ctx, func(o *xray.Options) { o.Region = cl.Region @@ -56,7 +56,7 @@ func fetchXraySamplingRules(ctx context.Context, meta schema.ClientMeta, parent func resolveXraySamplingRuleTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error { sr := resource.Item.(types.SamplingRuleRecord) cl := meta.(*client.Client) - svc := cl.Services().Xray + svc := cl.Services(client.AWSServiceXray).Xray params := xray.ListTagsForResourceInput{ResourceARN: sr.SamplingRule.RuleARN} output, err := svc.ListTagsForResource(ctx, ¶ms, func(o *xray.Options) { From a5133d9de17be42d446680809e33b4806ad3150c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 21:36:44 +0300 Subject: [PATCH 56/87] chore: Update plugin `source-awspricing` version to v3.0.5 (#13122) Updates the `source-awspricing` plugin latest version to v3.0.5 --- website/versions/source-awspricing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-awspricing.json b/website/versions/source-awspricing.json index 9cac6543e5f50e..c6ef6a97261325 100644 --- a/website/versions/source-awspricing.json +++ b/website/versions/source-awspricing.json @@ -1 +1 @@ -{ "latest": "plugins-source-awspricing-v3.0.4" } +{ "latest": "plugins-source-awspricing-v3.0.5" } From cc23de64abf085add28fd7c4c2121b083cb0dd6c Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 22:21:14 +0300 Subject: [PATCH 57/87] chore: Update plugin `source-gcp` version to v9.4.5 (#13126) Updates the `source-gcp` plugin latest version to v9.4.5 --- website/versions/source-gcp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-gcp.json b/website/versions/source-gcp.json index 56d0c2b076f9c9..84aed77a74a270 100644 --- a/website/versions/source-gcp.json +++ b/website/versions/source-gcp.json @@ -1 +1 @@ -{ "latest": "plugins-source-gcp-v9.4.4" } +{ "latest": "plugins-source-gcp-v9.4.5" } From d5195f120b08726a87bee4b42007935eea4e9061 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 22:55:48 +0300 Subject: [PATCH 58/87] chore: Update plugin `source-cloudflare` version to v5.0.5 (#13127) Updates the `source-cloudflare` plugin latest version to v5.0.5 --- website/versions/source-cloudflare.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-cloudflare.json b/website/versions/source-cloudflare.json index 164aebb365b10f..23e665062e962c 100644 --- a/website/versions/source-cloudflare.json +++ b/website/versions/source-cloudflare.json @@ -1 +1 @@ -{ "latest": "plugins-source-cloudflare-v5.0.4" } +{ "latest": "plugins-source-cloudflare-v5.0.5" } From fa75597f6dfd636d9e5579be2866f0d13573a4f3 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 23:15:35 +0300 Subject: [PATCH 59/87] chore: Update CLI version to v3.14.0 (#13128) Updates the CLI latest version to v3.14.0 --- website/versions/cli.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/cli.json b/website/versions/cli.json index add72c0c6e784f..ec7313a1b1bda0 100644 --- a/website/versions/cli.json +++ b/website/versions/cli.json @@ -1 +1 @@ -{ "latest": "cli-v3.13.1" } +{ "latest": "cli-v3.14.0" } From c7300523965570461f990fc7aa98ab4b233439c8 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Tue, 15 Aug 2023 22:37:31 +0200 Subject: [PATCH 60/87] feat: Improve error message on table with PKs (#13135) #### Summary Same as https://github.com/cloudquery/cloudquery/pull/13133 not from a fork for the CI to pass If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- scripts/table_diff/changes/types.go | 2 +- scripts/table_diff/go.mod | 14 +++++------ scripts/table_diff/go.sum | 39 ++++++++++++++++------------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/scripts/table_diff/changes/types.go b/scripts/table_diff/changes/types.go index 4b7c5a53910e0f..d418a2cb53567f 100644 --- a/scripts/table_diff/changes/types.go +++ b/scripts/table_diff/changes/types.go @@ -5,7 +5,7 @@ import ( "github.com/apache/arrow/go/v13/arrow" schemav2 "github.com/cloudquery/plugin-sdk/v2/schema" - "github.com/cloudquery/plugin-sdk/v3/types" + "github.com/cloudquery/plugin-sdk/v4/types" ) var cqToArrow = map[string]arrow.DataType{} diff --git a/scripts/table_diff/go.mod b/scripts/table_diff/go.mod index 6823bee94b7498..3d2a0d8e5b0ade 100644 --- a/scripts/table_diff/go.mod +++ b/scripts/table_diff/go.mod @@ -6,23 +6,23 @@ require ( github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 github.com/bluekeyes/go-gitdiff v0.7.1 github.com/cloudquery/plugin-sdk/v2 v2.7.0 - github.com/cloudquery/plugin-sdk/v3 v3.10.6 + github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/google/go-cmp v0.5.9 github.com/stretchr/testify v1.8.4 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/goccy/go-json v0.10.0 // indirect - github.com/google/flatbuffers v23.1.21+incompatible // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/uuid v1.3.0 // indirect - github.com/klauspost/cpuid/v2 v2.2.3 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/thoas/go-funk v0.9.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/sys v0.7.0 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect + golang.org/x/mod v0.11.0 // indirect + golang.org/x/sys v0.8.0 // indirect golang.org/x/tools v0.6.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/scripts/table_diff/go.sum b/scripts/table_diff/go.sum index 90c7583b1cfd63..4a9a3129638c2d 100644 --- a/scripts/table_diff/go.sum +++ b/scripts/table_diff/go.sum @@ -4,25 +4,28 @@ github.com/bluekeyes/go-gitdiff v0.7.1 h1:graP4ElLRshr8ecu0UtqfNTCHrtSyZd3DABQm/ github.com/bluekeyes/go-gitdiff v0.7.1/go.mod h1:QpfYYO1E0fTVHVZAZKiRjtSGY9823iCdvGXBcEzHGbM= github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U= github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug= -github.com/cloudquery/plugin-sdk/v3 v3.10.6 h1:KqTsLZ6OA1h8BUMeMcU6BAD6TBW6ojgQaC4zDZMgvu0= -github.com/cloudquery/plugin-sdk/v3 v3.10.6/go.mod h1:QhBaVgiNyQ3P6uAzJWOYpYykHXL+WDZffwg1riTwv60= +github.com/cloudquery/plugin-sdk/v4 v4.5.0 h1:NbUXQJumFQbc6jh0I6eN2CfoF2m4KsQaxjI0mZIAff4= +github.com/cloudquery/plugin-sdk/v4 v4.5.0/go.mod h1:lU/F5smij4Ud3sm2mqK//c/7loeYWywJdgq8lQrgOfY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= -github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA= -github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= -github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= @@ -32,21 +35,21 @@ github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xz github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 02ed22135c5b94cd98e7fbde0d8c8aa991625c61 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 16 Aug 2023 11:46:16 +0300 Subject: [PATCH 73/87] chore: Update plugin `destination-bigquery` version to v3.3.0 (#13155) Updates the `destination-bigquery` plugin latest version to v3.3.0 --- website/versions/destination-bigquery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-bigquery.json b/website/versions/destination-bigquery.json index 26614b0d95e85e..66229ccf723157 100644 --- a/website/versions/destination-bigquery.json +++ b/website/versions/destination-bigquery.json @@ -1 +1 @@ -{ "latest": "plugins-destination-bigquery-v3.2.2" } +{ "latest": "plugins-destination-bigquery-v3.3.0" } From 04eff45279a1559a11c0c8cf1085cb7d69539888 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Wed, 16 Aug 2023 11:52:38 +0300 Subject: [PATCH 74/87] chore: Update plugin `source-typeform` version to v1.0.0 (#13156) Updates the `source-typeform` plugin latest version to v1.0.0 --- website/versions/source-typeform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/source-typeform.json b/website/versions/source-typeform.json index f5f8f52dc94ab5..a3861afd90d392 100644 --- a/website/versions/source-typeform.json +++ b/website/versions/source-typeform.json @@ -1 +1 @@ -{ "latest": "plugins-source-typeform-v0.1.1" } +{ "latest": "plugins-source-typeform-v1.0.0" } From fbb6ca9c6ef50c4107da82307a09da4b706f62f0 Mon Sep 17 00:00:00 2001 From: Alex Shcherbakov Date: Wed, 16 Aug 2023 16:27:01 +0300 Subject: [PATCH 75/87] fix: Azure dashboards (#13158) Utilize `$__timeFilter` properly & exclude extra columns when building board --- .../dashboards/grafana/asset_inventory.json | 32 ++++--------------- .../azure/dashboards/grafana/compliance.json | 14 ++++---- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/plugins/source/azure/dashboards/grafana/asset_inventory.json b/plugins/source/azure/dashboards/grafana/asset_inventory.json index 6dc4d0be806290..cffd1c3486d223 100644 --- a/plugins/source/azure/dashboards/grafana/asset_inventory.json +++ b/plugins/source/azure/dashboards/grafana/asset_inventory.json @@ -123,7 +123,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select count(*) from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) and _cq_table in (${cq_tables}) ;", + "rawSql": "select count(*) from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) and _cq_table in (${cq_tables}) and $__timeFilter(_cq_sync_time);", "refId": "A" } ], @@ -183,7 +183,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select subscription_id, count(*) from azure_resources where location in (${locations}) and _cq_table in (${cq_tables}) group by subscription_id order by count desc;", + "rawSql": "select subscription_id, count(*) from azure_resources where location in (${locations}) and _cq_table in (${cq_tables}) and $__timeFilter(_cq_sync_time) group by subscription_id order by count desc;", "refId": "A" } ], @@ -259,7 +259,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select location, count(*) from azure_resources where subscription_id in (${subscription_ids}) group by location order by count desc;", + "rawSql": "select location, count(*) from azure_resources where subscription_id in (${subscription_ids}) and $__timeFilter(_cq_sync_time) group by location order by count desc;", "refId": "A" } ], @@ -383,26 +383,8 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select _cq_id, _cq_table, subscription_id, location, id, _cq_sync_time from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) and _cq_table in (${cq_tables}) ;", - "refId": "A", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "column" - } - ] - ], - "timeColumn": "time", - "where": [ - { - "name": "$__timeFilter", - "params": [], - "type": "macro" - } - ] + "rawSql": "select _cq_id, _cq_table, subscription_id, location, id, _cq_sync_time from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) and _cq_table in (${cq_tables}) and $__timeFilter(_cq_sync_time);", + "refId": "A" } ], "title": "Azure Resources", @@ -456,7 +438,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select _cq_table, count(*) from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) group by _cq_table order by count desc;", + "rawSql": "select _cq_table, count(*) from azure_resources where subscription_id in (${subscription_ids}) and location in (${locations}) and $__timeFilter(_cq_sync_time) group by _cq_table order by count desc;", "refId": "A" } ], @@ -540,7 +522,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select location, count(*) from azure_resources where subscription_id in (${subscription_ids}) group by location order by count desc;", + "rawSql": "select location, count(*) from azure_resources where subscription_id in (${subscription_ids}) and $__timeFilter(_cq_sync_time) group by location order by count desc;", "refId": "A" } ], diff --git a/plugins/source/azure/dashboards/grafana/compliance.json b/plugins/source/azure/dashboards/grafana/compliance.json index f54a97b39fce36..595d80cd610f00 100644 --- a/plugins/source/azure/dashboards/grafana/compliance.json +++ b/plugins/source/azure/dashboards/grafana/compliance.json @@ -90,7 +90,7 @@ "type": "postgres", "uid": "${DS_POSTGRESQL}" }, - "description": "This panel will show OK if the azure_resources view has been created and is accessible to the current Postgres user. See https://github.com/cloudquery/cloudquery/tree/main/plugins/source/azure/dashboards for more information.", + "description": "This panel will show OK if the azure_policy_results view has been created and is accessible to the current Postgres user. See https://github.com/cloudquery/cloudquery/tree/main/plugins/source/azure/dashboards for more information.", "fieldConfig": { "defaults": { "color": { @@ -188,7 +188,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "SELECT count(*) FROM information_schema.tables\n WHERE table_schema = 'public'\n AND table_name = 'azure_policy_results'", + "rawSql": "SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'azure_policy_results'", "refId": "A" } ], @@ -254,7 +254,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select _cq_sync_time as time, 1 from azure_compute_virtual_machines order by time desc limit 1;", + "rawSql": "select _cq_sync_time as time, 1 from azure_compute_virtual_machines order by time desc limit 1;", "refId": "A" } ], @@ -452,7 +452,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select\n -- execution_time as time,\n framework,\n count(case when status = 'fail' then 1 else null end) as fail,\n -- count(*)\n count(case when status = 'pass' then 1 else null end) as pass\nfrom azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) group by framework;", + "rawSql": "select framework, sum(case when status = 'fail' then 1 else 0 end) as fail, sum(case when status = 'pass' then 1 else 0 end) as pass from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and $__timeFilter(execution_time) group by framework;", "refId": "A" } ], @@ -517,7 +517,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select execution_time as time, count(*) from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status = 'fail' and $__timeFilter(execution_time) group by execution_time;", + "rawSql": "select count(*) from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status = 'fail' and $__timeFilter(execution_time);", "refId": "A" } ], @@ -581,7 +581,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select\n execution_time as time,\n count(*)\nfrom azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status = 'pass' and $__timeFilter(execution_time) group by execution_time;", + "rawSql": "select count(*) from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status = 'pass' and $__timeFilter(execution_time);", "refId": "A" } ], @@ -680,7 +680,7 @@ "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "select * from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status in (${status}) ;", + "rawSql": "select * from azure_policy_results where subscription_id in (${subscription_ids}) and framework in (${framework}) and status in (${status}) and $__timeFilter(execution_time);", "refId": "A" } ], From 3d40f5ba2eb6c7341f26f4cba69ba73bbfeb7c66 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Wed, 16 Aug 2023 16:13:00 +0200 Subject: [PATCH 76/87] fix(resources): Link to Go docs in `gcp_storage_buckets` (#13160) #### Summary Context in https://discord.com/channels/872925471417962546/1141351009545879612/1141361426284425246. The GO SDK for buckets doesn't mimic the JSON API, they have a different object struct for some reason, see https://github.com/googleapis/google-cloud-go/blob/fbe78a28e01043b059e86c6e960d092b299ac9a4/storage/bucket.go#L753 Not sure why they wrap is and normalize some properties instead of retuning the raw bucket (which they have). This PR links to the Go docs instead of the JSON API docs so it's easier to understand the data CloudQuery sync #### Summary Fixes https://github.com/cloudquery/cloudquery/issues/8869 --- .github/pr_labeler.yml | 2 + .github/workflows/source_airtable.yml | 59 + plugins/source/airtable/.dockerignore | 3 + plugins/source/airtable/.eslintrc | 62 + plugins/source/airtable/.gitignore | 134 + plugins/source/airtable/.prettierrc | 6 + plugins/source/airtable/Dockerfile | 17 + plugins/source/airtable/LICENSE | 373 ++ plugins/source/airtable/package-lock.json | 7291 +++++++++++++++++++++ plugins/source/airtable/package.json | 86 + plugins/source/airtable/src/airtable.ts | 878 +++ plugins/source/airtable/src/main.ts | 9 + plugins/source/airtable/src/plugin.ts | 76 + plugins/source/airtable/src/spec.ts | 41 + plugins/source/airtable/src/tables.ts | 283 + plugins/source/airtable/tsconfig.json | 9 + release-please-config.json | 4 + 17 files changed, 9333 insertions(+) create mode 100644 .github/workflows/source_airtable.yml create mode 100644 plugins/source/airtable/.dockerignore create mode 100644 plugins/source/airtable/.eslintrc create mode 100644 plugins/source/airtable/.gitignore create mode 100644 plugins/source/airtable/.prettierrc create mode 100644 plugins/source/airtable/Dockerfile create mode 100644 plugins/source/airtable/LICENSE create mode 100644 plugins/source/airtable/package-lock.json create mode 100644 plugins/source/airtable/package.json create mode 100644 plugins/source/airtable/src/airtable.ts create mode 100644 plugins/source/airtable/src/main.ts create mode 100644 plugins/source/airtable/src/plugin.ts create mode 100644 plugins/source/airtable/src/spec.ts create mode 100644 plugins/source/airtable/src/tables.ts create mode 100644 plugins/source/airtable/tsconfig.json diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml index 9bd11f4901525f..595c393420883f 100644 --- a/.github/pr_labeler.yml +++ b/.github/pr_labeler.yml @@ -1,3 +1,5 @@ +airtable: + - plugins/source/airtable/**/* alicloud: - plugins/source/alicloud/**/* aws: diff --git a/.github/workflows/source_airtable.yml b/.github/workflows/source_airtable.yml new file mode 100644 index 00000000000000..655a64dbdce17e --- /dev/null +++ b/.github/workflows/source_airtable.yml @@ -0,0 +1,59 @@ +name: Source Plugin Airtable Workflow + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + pull_request: + paths: + - "plugins/source/airtable/**" + - ".github/workflows/source_airtable.yml" + push: + branches: + - main + paths: + - "plugins/source/airtable/**" + - ".github/workflows/source_airtable.yml" + +jobs: + plugins-source-airtable: + timeout-minutes: 30 + name: "plugins/source/airtable" + runs-on: large-ubuntu-monorepo + defaults: + run: + working-directory: ./plugins/source/airtable + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: '16' + cache: 'npm' + cache-dependency-path: './plugins/source/airtable/package-lock.json' + + - name: Install dependencies + run: npm ci + + - name: Lint + run: | + npm run lint + + - name: Build + run: | + npm run build + validate-release: + timeout-minutes: 10 + runs-on: large-ubuntu-monorepo + env: + IMAGE_NAME_PREFIX: cloudquery + REGISTRY: ghcr.io + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 + + - name: Build and push Docker image + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: "{{defaultContext}}:plugins/source/airtable" + load: true diff --git a/plugins/source/airtable/.dockerignore b/plugins/source/airtable/.dockerignore new file mode 100644 index 00000000000000..8e480e43d0681c --- /dev/null +++ b/plugins/source/airtable/.dockerignore @@ -0,0 +1,3 @@ +node_modules +npm-debug.log +.env \ No newline at end of file diff --git a/plugins/source/airtable/.eslintrc b/plugins/source/airtable/.eslintrc new file mode 100644 index 00000000000000..02b99b4a151d3a --- /dev/null +++ b/plugins/source/airtable/.eslintrc @@ -0,0 +1,62 @@ +{ + "root": true, + "parser": "@typescript-eslint/parser", + "plugins": ["@typescript-eslint", "prettier", "unicorn", "unused-imports"], + "parserOptions": { + "project": "./tsconfig.json" + }, + "extends": [ + "eslint:recommended", + "plugin:import/recommended", + "plugin:import/typescript", + "plugin:@typescript-eslint/eslint-recommended", + "plugin:@typescript-eslint/recommended", + "prettier", + "plugin:unicorn/recommended", + "plugin:n/recommended", + "plugin:promise/recommended", + "plugin:ava/recommended", + "plugin:you-dont-need-lodash-underscore/all" + ], + "rules": { + "unicorn/no-null": 0, + "unused-imports/no-unused-imports": "error", + "no-console": "error", + "require-await": "off", + "@typescript-eslint/require-await": "error", + "@typescript-eslint/naming-convention": "error", + "import/no-cycle": "error", + "import/no-self-import": "error", + "@typescript-eslint/consistent-type-imports": "error", + "import/order": [ + 2, + { + "newlines-between": "always", + "alphabetize": { + "order": "asc", + "caseInsensitive": true + } + } + ] + }, + "overrides": [ + { + "files": ["src/grpc/**/*.ts"], + "rules": { + "@typescript-eslint/naming-convention": 0 + } + }, + { + "files": ["*test.ts"], + "rules": { + "unicorn/no-array-for-each": 0 + } + } + ], + "settings": { + "import/resolver": { + "typescript": true, + "node": true + } + } +} diff --git a/plugins/source/airtable/.gitignore b/plugins/source/airtable/.gitignore new file mode 100644 index 00000000000000..4e00445c6bc8c6 --- /dev/null +++ b/plugins/source/airtable/.gitignore @@ -0,0 +1,134 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +# Editor settings +.idea +.vscode diff --git a/plugins/source/airtable/.prettierrc b/plugins/source/airtable/.prettierrc new file mode 100644 index 00000000000000..6dd7b007a83e31 --- /dev/null +++ b/plugins/source/airtable/.prettierrc @@ -0,0 +1,6 @@ +{ + "semi": true, + "trailingComma": "all", + "singleQuote": true, + "printWidth": 120 +} diff --git a/plugins/source/airtable/Dockerfile b/plugins/source/airtable/Dockerfile new file mode 100644 index 00000000000000..7aecebfaf373d1 --- /dev/null +++ b/plugins/source/airtable/Dockerfile @@ -0,0 +1,17 @@ +FROM node:18-slim + +WORKDIR /app + +COPY package*.json ./ + +RUN npm ci + +COPY . . + +RUN npm run build + +EXPOSE 7777 + +ENTRYPOINT ["node", "dist/main.js"] + +CMD [ "serve", "--address", "[::]:7777", "--log-format", "json", "--log-level", "info" ] \ No newline at end of file diff --git a/plugins/source/airtable/LICENSE b/plugins/source/airtable/LICENSE new file mode 100644 index 00000000000000..a612ad9813b006 --- /dev/null +++ b/plugins/source/airtable/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/plugins/source/airtable/package-lock.json b/plugins/source/airtable/package-lock.json new file mode 100644 index 00000000000000..4d4808fde38361 --- /dev/null +++ b/plugins/source/airtable/package-lock.json @@ -0,0 +1,7291 @@ +{ + "name": "@cloudquery/cq-source-airtable", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@cloudquery/cq-source-airtable", + "version": "0.0.1", + "license": "MPL-2.0", + "dependencies": { + "@cloudquery/plugin-sdk-javascript": "^0.0.4", + "airtable": "^0.12.1", + "ajv": "^8.12.0", + "camelcase-keys": "^8.0.2", + "change-case": "^4.1.2", + "dayjs": "^1.11.9", + "dot-prop": "^8.0.2", + "got": "^13.0.0", + "p-map": "^6.0.0", + "read-pkg-up": "^10.0.0" + }, + "bin": { + "cq-source-airtable": "dist/main.js" + }, + "devDependencies": { + "@ava/typescript": "^4.1.0", + "@tsconfig/node16": "^16.1.0", + "@types/uuid": "^9.0.2", + "@types/yargs": "^17.0.24", + "@typescript-eslint/eslint-plugin": "^6.2.1", + "@typescript-eslint/parser": "^6.2.1", + "ava": "^5.3.1", + "eslint": "^8.46.0", + "eslint-config-prettier": "^9.0.0", + "eslint-config-standard": "^17.1.0", + "eslint-import-resolver-typescript": "^3.5.5", + "eslint-plugin-ava": "^14.0.0", + "eslint-plugin-import": "^2.28.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-unicorn": "^48.0.1", + "eslint-plugin-unused-imports": "^3.0.0", + "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0", + "prettier": "^3.0.1", + "ts-node": "^10.9.1", + "typescript": "^4.9.5" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@apache-arrow/esnext-esm": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@apache-arrow/esnext-esm/-/esnext-esm-12.0.1.tgz", + "integrity": "sha512-TXgd8dmH8y+cpbFryhCdAixTFZwEG5OUzkfh0ZaYe/V4P/JOA7hT3jBqvOZV833CLdNjAYjO0fl/p7NVL/ryPg==", + "dependencies": { + "@types/command-line-args": "5.2.0", + "@types/command-line-usage": "5.0.2", + "@types/node": "18.14.5", + "@types/pad-left": "2.1.1", + "command-line-args": "5.2.1", + "command-line-usage": "6.1.3", + "flatbuffers": "23.3.3", + "json-bignum": "^0.0.3", + "pad-left": "^2.1.0", + "tslib": "^2.5.0" + }, + "bin": { + "arrow2csv": "bin/arrow2csv.js" + } + }, + "node_modules/@apache-arrow/esnext-esm/node_modules/@types/node": { + "version": "18.14.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.5.tgz", + "integrity": "sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==" + }, + "node_modules/@ava/typescript": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@ava/typescript/-/typescript-4.1.0.tgz", + "integrity": "sha512-1iWZQ/nr9iflhLK9VN8H+1oDZqe93qxNnyYUz+jTzkYPAHc5fdZXBrqmNIgIfFhWYXK5OaQ5YtC7OmLeTNhVEg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^5.0.0", + "execa": "^7.1.1" + }, + "engines": { + "node": "^14.19 || ^16.15 || ^18 || ^20" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", + "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "dependencies": { + "@babel/highlight": "^7.22.10", + "chalk": "^2.4.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.22.10", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", + "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.5", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@cloudquery/plugin-pb-javascript": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-pb-javascript/-/plugin-pb-javascript-0.0.7.tgz", + "integrity": "sha512-EqcmnTEgnLYETtvDpJj+yGEE7Bq+MSGH2eioYd+zvGZLUOkF/VN8FT9XyIJlZqL70vstnMxet8s1XFM3TabSGg==", + "dependencies": { + "google-protobuf": "^3.21.2" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/@cloudquery/plugin-sdk-javascript": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@cloudquery/plugin-sdk-javascript/-/plugin-sdk-javascript-0.0.4.tgz", + "integrity": "sha512-zQEJXEiBZ0t9EStg06J/RXMqfVifO3BvQsFlREVQLJ7+MIpC3Ujbvhhu1UuIDyJbWTHzCZmJbMXuTN90X/8pTg==", + "dependencies": { + "@apache-arrow/esnext-esm": "^12.0.1", + "@cloudquery/plugin-pb-javascript": "^0.0.7", + "@grpc/grpc-js": "^1.9.0", + "@types/luxon": "^3.3.1", + "ajv": "^8.12.0", + "boolean": "^3.2.0", + "dot-prop": "^8.0.2", + "luxon": "^3.4.0", + "matcher": "^5.0.0", + "modern-errors": "^6.0.0", + "modern-errors-bugs": "^4.0.0", + "p-map": "^6.0.0", + "p-timeout": "^6.1.2", + "uuid": "^9.0.0", + "winston": "^3.10.0", + "winston-error-format": "^2.0.0", + "yargs": "^17.7.2" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/@cloudquery/plugin-sdk-javascript/node_modules/p-timeout": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.2.tgz", + "integrity": "sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/@eslint/js": { + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@grpc/grpc-js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.0.tgz", + "integrity": "sha512-H8+iZh+kCE6VR/Krj6W28Y/ZlxoZ1fOzsNt77nrdE3knkbSelW1Uus192xOFCxHyeszLj8i4APQkSIXjAoOxXg==", + "dependencies": { + "@grpc/proto-loader": "^0.7.0", + "@types/node": ">=12.12.47" + }, + "engines": { + "node": "^8.13.0 || >=10.10.0" + } + }, + "node_modules/@grpc/proto-loader": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.8.tgz", + "integrity": "sha512-GU12e2c8dmdXb7XUlOgYWZ2o2i+z9/VeACkxTA/zzAe2IjclC5PnVL0lpgjhrqfpDYHzM8B1TF6pqWegMYAzlA==", + "dependencies": { + "@types/long": "^4.0.1", + "lodash.camelcase": "^4.3.0", + "long": "^4.0.0", + "protobufjs": "^7.2.4", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", + "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgr/utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "fast-glob": "^3.3.0", + "is-glob": "^4.0.3", + "open": "^9.1.0", + "picocolors": "^1.0.0", + "tslib": "^2.6.0" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/@protobufjs/aspromise": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", + "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==" + }, + "node_modules/@protobufjs/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==" + }, + "node_modules/@protobufjs/codegen": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", + "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==" + }, + "node_modules/@protobufjs/eventemitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", + "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==" + }, + "node_modules/@protobufjs/fetch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", + "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", + "dependencies": { + "@protobufjs/aspromise": "^1.1.1", + "@protobufjs/inquire": "^1.1.0" + } + }, + "node_modules/@protobufjs/float": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz", + "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==" + }, + "node_modules/@protobufjs/inquire": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", + "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==" + }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", + "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==" + }, + "node_modules/@protobufjs/pool": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz", + "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==" + }, + "node_modules/@protobufjs/utf8": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", + "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" + }, + "node_modules/@sindresorhus/is": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", + "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", + "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", + "dependencies": { + "defer-to-connect": "^2.0.1" + }, + "engines": { + "node": ">=14.16" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-16.1.0.tgz", + "integrity": "sha512-cfwhqrdZEKS+Iqu1OPDwmKsOV/eo7q4sPhWzOXc1rU77nnPFV3+77yPg8uKQ2e8eir6mERCvrKnd+EGa4qo4bQ==", + "dev": true + }, + "node_modules/@types/command-line-args": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.2.0.tgz", + "integrity": "sha512-UuKzKpJJ/Ief6ufIaIzr3A/0XnluX7RvFgwkV89Yzvm77wCh1kFaFmqN8XEnGcN62EuHdedQjEMb8mYxFLGPyA==" + }, + "node_modules/@types/command-line-usage": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@types/command-line-usage/-/command-line-usage-5.0.2.tgz", + "integrity": "sha512-n7RlEEJ+4x4TS7ZQddTmNSxP+zziEG0TNsMfiRIxcIVXt71ENJ9ojeXmGO3wPoTdn7pJcU2xc3CJYMktNT6DPg==" + }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", + "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==" + }, + "node_modules/@types/json-schema": { + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", + "dev": true + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@types/long": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", + "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" + }, + "node_modules/@types/luxon": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.1.tgz", + "integrity": "sha512-XOS5nBcgEeP2PpcqJHjCWhUCAzGfXIU8ILOSLpx2FhxqMW9KdxgCGXNOEKGVBfveKtIpztHzKK5vSRVLyW/NqA==" + }, + "node_modules/@types/node": { + "version": "14.18.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.54.tgz", + "integrity": "sha512-uq7O52wvo2Lggsx1x21tKZgqkJpvwCseBBPtX/nKQfpVlEsLOb11zZ1CRsWUKvJF0+lzuA9jwvA7Pr2Wt7i3xw==" + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz", + "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==" + }, + "node_modules/@types/pad-left": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/pad-left/-/pad-left-2.1.1.tgz", + "integrity": "sha512-Xd22WCRBydkGSApl5Bw0PhAOHKSVjNL3E3AwzKaps96IMraPqy5BvZIsBVK6JLwdybUzjHnuWVwpDd0JjTfHXA==" + }, + "node_modules/@types/semver": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", + "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", + "dev": true + }, + "node_modules/@types/triple-beam": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz", + "integrity": "sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==" + }, + "node_modules/@types/uuid": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz", + "integrity": "sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", + "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.3.0.tgz", + "integrity": "sha512-IZYjYZ0ifGSLZbwMqIip/nOamFiWJ9AH+T/GYNZBWkVcyNQOFGtSMoWV7RvY4poYCMZ/4lHzNl796WOSNxmk8A==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/type-utils": "6.3.0", + "@typescript-eslint/utils": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.3.0.tgz", + "integrity": "sha512-ibP+y2Gr6p0qsUkhs7InMdXrwldjxZw66wpcQq9/PzAroM45wdwyu81T+7RibNCh8oc0AgrsyCwJByncY0Ongg==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.3.0.tgz", + "integrity": "sha512-WlNFgBEuGu74ahrXzgefiz/QlVb+qg8KDTpknKwR7hMH+lQygWyx0CQFoUmMn1zDkQjTBBIn75IxtWss77iBIQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.3.0.tgz", + "integrity": "sha512-7Oj+1ox1T2Yc8PKpBvOKWhoI/4rWFd1j7FA/rPE0lbBPXTKjdbtC+7Ev0SeBjEKkIhKWVeZSP+mR7y1Db1CdfQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "6.3.0", + "@typescript-eslint/utils": "6.3.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.3.0.tgz", + "integrity": "sha512-K6TZOvfVyc7MO9j60MkRNWyFSf86IbOatTKGrpTQnzarDZPYPVy0oe3myTMq7VjhfsUAbNUW8I5s+2lZvtx1gg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.3.0.tgz", + "integrity": "sha512-Xh4NVDaC4eYKY4O3QGPuQNp5NxBAlEvNQYOqJquR2MePNxO11E5K3t5x4M4Mx53IZvtpW+mBxIT0s274fLUocg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/visitor-keys": "6.3.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.3.0.tgz", + "integrity": "sha512-hLLg3BZE07XHnpzglNBG8P/IXq/ZVXraEbgY7FM0Cnc1ehM8RMdn9mat3LubJ3KBeYXXPxV1nugWbQPjGeJk6Q==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.3.0", + "@typescript-eslint/types": "6.3.0", + "@typescript-eslint/typescript-estree": "6.3.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.3.0.tgz", + "integrity": "sha512-kEhRRj7HnvaSjux1J9+7dBen15CdWmDnwrpyiHsFX6Qx2iW5LOBUgNefOFeh2PjWPlNwN8TOn6+4eBU3J/gupw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.3.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, + "node_modules/abortcontroller-polyfill": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz", + "integrity": "sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==" + }, + "node_modules/acorn": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/aggregate-error": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz", + "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==", + "dev": true, + "dependencies": { + "clean-stack": "^4.0.0", + "indent-string": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/airtable": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/airtable/-/airtable-0.12.1.tgz", + "integrity": "sha512-wS49QIO46YjSUbRIslX6pJaAGsdzOFPtYfaARYsBifsev10TDsyXc5IBYX6b3JQs4SZ8A5+g/vbQ5IfPvbnc+w==", + "dependencies": { + "@types/node": ">=8.0.0 <15", + "abort-controller": "^3.0.0", + "abortcontroller-polyfill": "^1.4.0", + "lodash": "^4.17.21", + "node-fetch": "^2.6.7" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-back": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", + "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", + "engines": { + "node": ">=6" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-includes": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", + "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", + "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", + "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arrgv": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arrgv/-/arrgv-1.0.2.tgz", + "integrity": "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/arrify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz", + "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, + "node_modules/ava": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ava/-/ava-5.3.1.tgz", + "integrity": "sha512-Scv9a4gMOXB6+ni4toLuhAm9KYWEjsgBglJl+kMGI5+IVDt120CCDZyB5HNU9DjmLI2t4I0GbnxGLmmRfGTJGg==", + "dev": true, + "dependencies": { + "acorn": "^8.8.2", + "acorn-walk": "^8.2.0", + "ansi-styles": "^6.2.1", + "arrgv": "^1.0.2", + "arrify": "^3.0.0", + "callsites": "^4.0.0", + "cbor": "^8.1.0", + "chalk": "^5.2.0", + "chokidar": "^3.5.3", + "chunkd": "^2.0.1", + "ci-info": "^3.8.0", + "ci-parallel-vars": "^1.0.1", + "clean-yaml-object": "^0.1.0", + "cli-truncate": "^3.1.0", + "code-excerpt": "^4.0.0", + "common-path-prefix": "^3.0.0", + "concordance": "^5.0.4", + "currently-unhandled": "^0.4.1", + "debug": "^4.3.4", + "emittery": "^1.0.1", + "figures": "^5.0.0", + "globby": "^13.1.4", + "ignore-by-default": "^2.1.0", + "indent-string": "^5.0.0", + "is-error": "^2.2.2", + "is-plain-object": "^5.0.0", + "is-promise": "^4.0.0", + "matcher": "^5.0.0", + "mem": "^9.0.2", + "ms": "^2.1.3", + "p-event": "^5.0.1", + "p-map": "^5.5.0", + "picomatch": "^2.3.1", + "pkg-conf": "^4.0.0", + "plur": "^5.1.0", + "pretty-ms": "^8.0.0", + "resolve-cwd": "^3.0.0", + "stack-utils": "^2.0.6", + "strip-ansi": "^7.0.1", + "supertap": "^3.0.1", + "temp-dir": "^3.0.0", + "write-file-atomic": "^5.0.1", + "yargs": "^17.7.2" + }, + "bin": { + "ava": "entrypoints/cli.mjs" + }, + "engines": { + "node": ">=14.19 <15 || >=16.15 <17 || >=18" + }, + "peerDependencies": { + "@ava/typescript": "*" + }, + "peerDependenciesMeta": { + "@ava/typescript": { + "optional": true + } + } + }, + "node_modules/ava/node_modules/globby": { + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz", + "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==", + "dev": true, + "dependencies": { + "dir-glob": "^3.0.1", + "fast-glob": "^3.3.0", + "ignore": "^5.2.4", + "merge2": "^1.4.1", + "slash": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ava/node_modules/p-map": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz", + "integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==", + "dev": true, + "dependencies": { + "aggregate-error": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ava/node_modules/slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/big-integer": { + "version": "1.6.51", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", + "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/blueimp-md5": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", + "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", + "dev": true + }, + "node_modules/boolean": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", + "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==" + }, + "node_modules/bplist-parser": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", + "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", + "dev": true, + "dependencies": { + "big-integer": "^1.6.44" + }, + "engines": { + "node": ">= 5.10.0" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "dev": true, + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/bundle-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", + "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", + "dev": true, + "dependencies": { + "run-applescript": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cacheable-lookup": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", + "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", + "engines": { + "node": ">=14.16" + } + }, + "node_modules/cacheable-request": { + "version": "10.2.13", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.13.tgz", + "integrity": "sha512-3SD4rrMu1msNGEtNSt8Od6enwdo//U9s4ykmXfA2TD58kcLkCobtCDiby7kNyj7a/Q7lz/mAesAFI54rTdnvBA==", + "dependencies": { + "@types/http-cache-semantics": "^4.0.1", + "get-stream": "^6.0.1", + "http-cache-semantics": "^4.1.1", + "keyv": "^4.5.3", + "mimic-response": "^4.0.0", + "normalize-url": "^8.0.0", + "responselike": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.1.0.tgz", + "integrity": "sha512-aBMbD1Xxay75ViYezwT40aQONfr+pSXTHwNKvIXhXD6+LY3F1dLIcceoC5OZKBVHbXcysz1hL9D2w0JJIMXpUw==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "dependencies": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, + "node_modules/camelcase": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", + "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camelcase-keys": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-8.0.2.tgz", + "integrity": "sha512-qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==", + "dependencies": { + "camelcase": "^7.0.0", + "map-obj": "^4.3.0", + "quick-lru": "^6.1.1", + "type-fest": "^2.13.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camelcase-keys/node_modules/quick-lru": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-6.1.1.tgz", + "integrity": "sha512-S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camelcase-keys/node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/capital-case": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, + "node_modules/cbor": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/cbor/-/cbor-8.1.0.tgz", + "integrity": "sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==", + "dev": true, + "dependencies": { + "nofilter": "^3.1.0" + }, + "engines": { + "node": ">=12.19" + } + }, + "node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/change-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", + "dependencies": { + "camel-case": "^4.1.2", + "capital-case": "^1.0.4", + "constant-case": "^3.0.4", + "dot-case": "^3.0.4", + "header-case": "^2.0.4", + "no-case": "^3.0.4", + "param-case": "^3.0.4", + "pascal-case": "^3.1.2", + "path-case": "^3.0.4", + "sentence-case": "^3.0.4", + "snake-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chunkd": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chunkd/-/chunkd-2.0.1.tgz", + "integrity": "sha512-7d58XsFmOq0j6el67Ug9mHf9ELUXsQXYJBkyxhH/k+6Ke0qXRnv0kbemx+Twc6fRJ07C49lcbdgm9FL1Ei/6SQ==", + "dev": true + }, + "node_modules/ci-info": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/ci-parallel-vars": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ci-parallel-vars/-/ci-parallel-vars-1.0.1.tgz", + "integrity": "sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==", + "dev": true + }, + "node_modules/clean-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", + "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/clean-regexp/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/clean-stack": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz", + "integrity": "sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/clean-yaml-object": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", + "integrity": "sha512-3yONmlN9CSAkzNwnRCiJQ7Q2xK5mWuEfL3PuTZcAUzhObbXsfsnMptJzXwz93nc5zn9V9TwCVMmV7w4xsm43dw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "dev": true, + "dependencies": { + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/code-excerpt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-4.0.0.tgz", + "integrity": "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==", + "dev": true, + "dependencies": { + "convert-to-spaces": "^2.0.1" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, + "node_modules/command-line-args": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", + "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", + "dependencies": { + "array-back": "^3.1.0", + "find-replace": "^3.0.0", + "lodash.camelcase": "^4.3.0", + "typical": "^4.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/command-line-usage": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz", + "integrity": "sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==", + "dependencies": { + "array-back": "^4.0.2", + "chalk": "^2.4.2", + "table-layout": "^1.0.2", + "typical": "^5.2.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/command-line-usage/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/command-line-usage/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/command-line-usage/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/concordance": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz", + "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==", + "dev": true, + "dependencies": { + "date-time": "^3.1.0", + "esutils": "^2.0.3", + "fast-diff": "^1.2.0", + "js-string-escape": "^1.0.1", + "lodash": "^4.17.15", + "md5-hex": "^3.0.1", + "semver": "^7.3.2", + "well-known-symbols": "^2.0.0" + }, + "engines": { + "node": ">=10.18.0 <11 || >=12.14.0 <13 || >=14" + } + }, + "node_modules/constant-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case": "^2.0.2" + } + }, + "node_modules/convert-to-spaces": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz", + "integrity": "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", + "dev": true, + "dependencies": { + "array-find-index": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/date-time": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz", + "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==", + "dev": true, + "dependencies": { + "time-zone": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/dayjs": { + "version": "1.11.9", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", + "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==" + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/default-browser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", + "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", + "dev": true, + "dependencies": { + "bundle-name": "^3.0.0", + "default-browser-id": "^3.0.0", + "execa": "^7.1.1", + "titleize": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser-id": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", + "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", + "dev": true, + "dependencies": { + "bplist-parser": "^0.2.0", + "untildify": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-properties": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "dev": true, + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/dot-prop": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-8.0.2.tgz", + "integrity": "sha512-xaBe6ZT4DHPkg0k4Ytbvn5xoxgpG0jOS1dYxSOwAHPuNLjP3/OzN0gH55SrLqpx8cBfSaVt91lXYkApjb+nYdQ==", + "dependencies": { + "type-fest": "^3.8.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dot-prop/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, + "node_modules/emittery": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-1.0.1.tgz", + "integrity": "sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" + }, + "node_modules/enhance-visitors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/enhance-visitors/-/enhance-visitors-1.0.0.tgz", + "integrity": "sha512-+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA==", + "dev": true, + "dependencies": { + "lodash": "^4.13.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/enhanced-resolve": { + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/error-class-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/error-class-utils/-/error-class-utils-3.0.0.tgz", + "integrity": "sha512-L26cyYkaV6nzbUbmDRNSXAZfcuQy4cvEDvD+WoRF6c6nIEEydfgn7grd+idf2xLVYaTHnn7yYQjaz+Dnx+N1lQ==", + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/error-custom-class": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/error-custom-class/-/error-custom-class-9.0.0.tgz", + "integrity": "sha512-cfXOxbwRQpXLUSecZctO/GPtKm9auTd2v1eY4CsclMgRkse/h5w59V1u1p7LdStVnw/SCbROcsd5zLenauvlRw==", + "dependencies": { + "error-class-utils": "^3.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-serializer": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/error-serializer/-/error-serializer-6.0.1.tgz", + "integrity": "sha512-SDEXcpWyys6yd6zLcC+s5bGnfe+xWxBJoC7p+o72c5F+hDdgdWc8LB8EOvcdqs7U+rzInYldFpiqSwmC3VZUeg==", + "dependencies": { + "is-error-instance": "^2.0.0", + "is-plain-obj": "^4.1.0", + "normalize-exception": "^3.0.0", + "safe-json-value": "^2.0.1", + "set-error-class": "^2.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/es-abstract": { + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", + "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.1", + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-set-tostringtag": "^2.0.1", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.1", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.10", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.0", + "safe-array-concat": "^1.0.0", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", + "@humanwhocodes/config-array": "^0.11.10", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-import-resolver-typescript": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.0.tgz", + "integrity": "sha512-QTHR9ddNnn35RTxlaEnx2gCxqFlF2SEN0SE2d17SqwyM7YOSI2GHWRYp5BiRkObTUNYPupC/3Fq2a0PpT+EKpg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "enhanced-resolve": "^5.12.0", + "eslint-module-utils": "^2.7.4", + "fast-glob": "^3.3.1", + "get-tsconfig": "^4.5.0", + "is-core-module": "^2.11.0", + "is-glob": "^4.0.3" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" + }, + "peerDependencies": { + "eslint": "*", + "eslint-plugin-import": "*" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", + "dev": true, + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-ava": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-ava/-/eslint-plugin-ava-14.0.0.tgz", + "integrity": "sha512-XmKT6hppaipwwnLVwwvQliSU6AF1QMHiNoLD5JQfzhUhf0jY7CO0O624fQrE+Y/fTb9vbW8r77nKf7M/oHulxw==", + "dev": true, + "dependencies": { + "enhance-visitors": "^1.0.0", + "eslint-utils": "^3.0.0", + "espree": "^9.0.0", + "espurify": "^2.1.1", + "import-modules": "^2.1.0", + "micro-spelling-correcter": "^1.1.1", + "pkg-dir": "^5.0.0", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=14.17 <15 || >=16.4" + }, + "peerDependencies": { + "eslint": ">=8.26.0" + } + }, + "node_modules/eslint-plugin-es-x": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.2.0.tgz", + "integrity": "sha512-9dvv5CcvNjSJPqnS5uZkqb3xmbeqRLnvXKK7iI5+oK/yTusyc46zbBZKENGsOfojm/mKfszyZb+wNqNPAPeGXA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.6.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ota-meshi" + }, + "peerDependencies": { + "eslint": ">=8" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", + "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.7", + "eslint-module-utils": "^2.8.0", + "has": "^1.0.3", + "is-core-module": "^2.12.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", + "object.values": "^1.1.6", + "resolve": "^1.22.3", + "semver": "^6.3.1", + "tsconfig-paths": "^3.14.2" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-plugin-n": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.1.tgz", + "integrity": "sha512-CDmHegJN0OF3L5cz5tATH84RPQm9kG+Yx39wIqIwPR2C0uhBGMWfbbOtetR83PQjjidA5aXMu+LEFw1jaSwvTA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "builtins": "^5.0.1", + "eslint-plugin-es-x": "^7.1.0", + "ignore": "^5.2.4", + "is-core-module": "^2.12.1", + "minimatch": "^3.1.2", + "resolve": "^1.22.2", + "semver": "^7.5.3" + }, + "engines": { + "node": ">=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", + "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.5" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/prettier" + }, + "peerDependencies": { + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "prettier": ">=3.0.0" + }, + "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", + "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/eslint-plugin-unicorn": { + "version": "48.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz", + "integrity": "sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.5", + "@eslint-community/eslint-utils": "^4.4.0", + "ci-info": "^3.8.0", + "clean-regexp": "^1.0.0", + "esquery": "^1.5.0", + "indent-string": "^4.0.0", + "is-builtin-module": "^3.2.1", + "jsesc": "^3.0.2", + "lodash": "^4.17.21", + "pluralize": "^8.0.0", + "read-pkg-up": "^7.0.1", + "regexp-tree": "^0.1.27", + "regjsparser": "^0.10.0", + "semver": "^7.5.4", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1" + }, + "peerDependencies": { + "eslint": ">=8.44.0" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, + "node_modules/eslint-plugin-unicorn/node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/eslint-plugin-unicorn/node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/eslint-plugin-unicorn/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/normalize-package-data/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "dev": true, + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/read-pkg-up": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", + "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", + "dev": true, + "dependencies": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/read-pkg/node_modules/type-fest": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-plugin-unused-imports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.0.0.tgz", + "integrity": "sha512-sduiswLJfZHeeBJ+MQaG+xYzSWdRXoSw61DpU13mzWumCkR0ufD0HmO4kdNokjrkluMHpj/7PJeN35pgbhW3kw==", + "dev": true, + "dependencies": { + "eslint-rule-composer": "^0.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": "^6.0.0", + "eslint": "^8.0.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/eslint-plugin": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-you-dont-need-lodash-underscore": { + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-you-dont-need-lodash-underscore/-/eslint-plugin-you-dont-need-lodash-underscore-6.12.0.tgz", + "integrity": "sha512-WF4mNp+k2532iswT6iUd1BX6qjd3AV4cFy/09VC82GY9SsRtvkxhUIx7JNGSe0/bLyd57oTr4inPFiIaENXhGw==", + "dev": true, + "dependencies": { + "kebab-case": "^1.0.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint-rule-composer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz", + "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/eslint/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/eslint/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/espurify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/espurify/-/espurify-2.1.1.tgz", + "integrity": "sha512-zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ==", + "dev": true + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-diff": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", + "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fecha": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" + }, + "node_modules/figures": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz", + "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^5.0.0", + "is-unicode-supported": "^1.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/filter-obj": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-5.1.0.tgz", + "integrity": "sha512-qWeTREPoT7I0bifpPUXtxkZJ1XJzxWtfoWWkdVGqa+eCr3SHW/Ocp89o8vLvbUuQnadybJpjOKu4V+RwO6sGng==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/find-replace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", + "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", + "dependencies": { + "array-back": "^3.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatbuffers": { + "version": "23.3.3", + "resolved": "https://registry.npmjs.org/flatbuffers/-/flatbuffers-23.3.3.tgz", + "integrity": "sha512-jmreOaAT1t55keaf+Z259Tvh8tR/Srry9K8dgCgvizhKSEr6gLGgaOJI2WFL5fkOpGOGRZwxUrlFn0GCmXUy6g==" + }, + "node_modules/flatted": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", + "dev": true + }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/form-data-encoder": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", + "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", + "engines": { + "node": ">= 14.17" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-tsconfig": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.0.tgz", + "integrity": "sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==", + "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/google-protobuf": { + "version": "3.21.2", + "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", + "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==" + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/got": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", + "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==", + "dependencies": { + "@sindresorhus/is": "^5.2.0", + "@szmarczak/http-timer": "^5.0.1", + "cacheable-lookup": "^7.0.0", + "cacheable-request": "^10.2.8", + "decompress-response": "^6.0.0", + "form-data-encoder": "^2.1.2", + "get-stream": "^6.0.1", + "http2-wrapper": "^2.1.10", + "lowercase-keys": "^3.0.0", + "p-cancelable": "^3.0.0", + "responselike": "^3.0.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/header-case": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", + "dependencies": { + "capital-case": "^1.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/hosted-git-info": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", + "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", + "dependencies": { + "lru-cache": "^7.5.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/hosted-git-info/node_modules/lru-cache": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", + "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "node_modules/http2-wrapper": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz", + "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==", + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.2.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, + "node_modules/human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true, + "engines": { + "node": ">=14.18.0" + } + }, + "node_modules/ignore": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/ignore-by-default": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-2.1.0.tgz", + "integrity": "sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==", + "dev": true, + "engines": { + "node": ">=10 <11 || >=12 <13 || >=14" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/import-modules": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-modules/-/import-modules-2.1.0.tgz", + "integrity": "sha512-8HEWcnkbGpovH9yInoisxaSoIg9Brbul+Ju3Kqe2UsYDUBJD/iQjSgEj0zPcTDPKfPp2fs5xlv1i+JSye/m1/A==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/irregular-plurals": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz", + "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "dependencies": { + "builtin-modules": "^3.3.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-error": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.2.tgz", + "integrity": "sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==", + "dev": true + }, + "node_modules/is-error-instance": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-error-instance/-/is-error-instance-2.0.0.tgz", + "integrity": "sha512-5RuM+oFY0P5MRa1nXJo6IcTx9m2VyXYhRtb4h0olsi2GHci4bqZ6akHk+GmCYvDrAR9yInbiYdr2pnoqiOMw/Q==", + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", + "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-wsl/node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/js-string-escape": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", + "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-bignum": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz", + "integrity": "sha512-2WHyXj3OfHSgNyuzDbSxI1w2jgw5gkWSWhS7Qg4bWXx1nLk3jnbwfUeS0PSba3IzpTUWdHxBieELUzXRjQB2zg==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-parse-even-better-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz", + "integrity": "sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/kebab-case": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.2.tgz", + "integrity": "sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==", + "dev": true + }, + "node_modules/keyv": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==" + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/load-json-file": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz", + "integrity": "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/logform": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz", + "integrity": "sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==", + "dependencies": { + "@colors/colors": "1.5.0", + "@types/triple-beam": "^1.3.2", + "fecha": "^4.2.0", + "ms": "^2.1.1", + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" + } + }, + "node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/lowercase-keys": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", + "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/luxon": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz", + "integrity": "sha512-7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw==", + "engines": { + "node": ">=12" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", + "dev": true, + "dependencies": { + "p-defer": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/matcher": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-5.0.0.tgz", + "integrity": "sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==", + "dependencies": { + "escape-string-regexp": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/md5-hex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz", + "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==", + "dev": true, + "dependencies": { + "blueimp-md5": "^2.10.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mem": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/mem/-/mem-9.0.2.tgz", + "integrity": "sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==", + "dev": true, + "dependencies": { + "map-age-cleaner": "^0.1.3", + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sindresorhus/mem?sponsor=1" + } + }, + "node_modules/merge-error-cause": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/merge-error-cause/-/merge-error-cause-4.0.1.tgz", + "integrity": "sha512-fTPQshSNjhq6BGvoe5F6xezzcWTn98rog8Ra0gJ0jqgwZXizPNRyg/pjhWX5+pXYanecSPUXa17uEM/RwZfKXw==", + "dependencies": { + "normalize-exception": "^3.0.0", + "set-error-class": "^2.0.0", + "set-error-props": "^5.0.0", + "wrap-error-message": "^2.0.1" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micro-spelling-correcter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/micro-spelling-correcter/-/micro-spelling-correcter-1.1.1.tgz", + "integrity": "sha512-lkJ3Rj/mtjlRcHk6YyCbvZhyWTOzdBvTHsxMmZSk5jxN1YyVSQ+JETAom55mdzfcyDrY/49Z7UCW760BK30crg==", + "dev": true + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mimic-response": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", + "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/modern-errors": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/modern-errors/-/modern-errors-6.0.0.tgz", + "integrity": "sha512-IgtbY9ITQfbtZUdoIiqOwReV+Z2iL82OtwWTNV9cusKT/SvNivIAXKyGjEGcoCpLc+32UZp0DuqXViIDAG44Zg==", + "dependencies": { + "error-class-utils": "^3.0.0", + "error-custom-class": "^9.0.0", + "filter-obj": "^5.1.0", + "is-plain-obj": "^4.1.0", + "merge-error-cause": "^4.0.1", + "normalize-exception": "^3.0.0", + "set-error-message": "^2.0.1", + "set-error-props": "^5.0.0", + "set-error-stack": "^2.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/modern-errors-bugs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/modern-errors-bugs/-/modern-errors-bugs-4.0.0.tgz", + "integrity": "sha512-kFKGiT1JtXreUOs6lQTTElIx1g/ZRZOsnI+vfZWCC7GRCgZQysmhXwN+7ypKqM/j3LNJbbSub2NI71ZZAUlkjw==", + "engines": { + "node": ">=16.17.0" + }, + "peerDependencies": { + "modern-errors": "^6.0.0" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "dev": true + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/node-fetch": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz", + "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/nofilter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz", + "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==", + "dev": true, + "engines": { + "node": ">=12.19" + } + }, + "node_modules/normalize-exception": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-exception/-/normalize-exception-3.0.0.tgz", + "integrity": "sha512-SMZtWSLjls45KBgwvS2jWyXLtOI9j90JyQ6tJstl91Gti4W7QwZyF/nWwlFRz/Cx4Gy70DAtLT0EzXYXcPJJUw==", + "dependencies": { + "is-error-instance": "^2.0.0", + "is-plain-obj": "^4.1.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/normalize-package-data": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", + "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", + "dependencies": { + "hosted-git-info": "^6.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", + "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", + "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", + "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.21.2", + "get-intrinsic": "^1.2.1" + } + }, + "node_modules/object.values": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "dependencies": { + "fn.name": "1.x.x" + } + }, + "node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-cancelable": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", + "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", + "engines": { + "node": ">=12.20" + } + }, + "node_modules/p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-event": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz", + "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==", + "dev": true, + "dependencies": { + "p-timeout": "^5.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-6.0.0.tgz", + "integrity": "sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-timeout": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz", + "integrity": "sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pad-left": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pad-left/-/pad-left-2.1.0.tgz", + "integrity": "sha512-HJxs9K9AztdIQIAIa/OIazRAUW/L6B9hbQDxO4X07roW3eo9XqZc2ur9bn1StH9CnbbI9EgvejHQX7CBpCF1QA==", + "dependencies": { + "repeat-string": "^1.5.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module/node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.0.0.tgz", + "integrity": "sha512-kP+TQYAzAiVnzOlWOe0diD6L35s9bJh0SCn95PIbZFKrOYuIRQsQkeWEYxzVDuHTt9V9YqvYCJ2Qo4z9wdfZPw==", + "dependencies": { + "@babel/code-frame": "^7.21.4", + "error-ex": "^1.3.2", + "json-parse-even-better-errors": "^3.0.0", + "lines-and-columns": "^2.0.3", + "type-fest": "^3.8.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-json/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-ms": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-3.0.0.tgz", + "integrity": "sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-conf": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-4.0.0.tgz", + "integrity": "sha512-7dmgi4UY4qk+4mj5Cd8v/GExPo0K+SlY+hulOSdfZ/T6jVH6//y7NtzZo5WrfhDBxuQ0jCa7fLZmNaNh7EWL/w==", + "dev": true, + "dependencies": { + "find-up": "^6.0.0", + "load-json-file": "^7.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dev": true, + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/pkg-conf/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "dev": true, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz", + "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", + "dev": true, + "dependencies": { + "find-up": "^5.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/plur": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz", + "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==", + "dev": true, + "dependencies": { + "irregular-plurals": "^3.3.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pluralize": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", + "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/pretty-ms": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz", + "integrity": "sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==", + "dev": true, + "dependencies": { + "parse-ms": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/protobufjs": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz", + "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==", + "hasInstallScript": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/node": ">=13.7.0", + "long": "^5.0.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/protobufjs/node_modules/long": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", + "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" + }, + "node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.0.0.tgz", + "integrity": "sha512-Ajb9oSjxXBw0YyOiwtQ2dKbAA/vMnUPnY63XcCk+mXo0BwIdQEMgZLZiMWGttQHcUhUgbK0mH85ethMPKXxziw==", + "dependencies": { + "@types/normalize-package-data": "^2.4.1", + "normalize-package-data": "^5.0.0", + "parse-json": "^7.0.0", + "type-fest": "^3.8.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-10.0.0.tgz", + "integrity": "sha512-jgmKiS//w2Zs+YbX039CorlkOp8FIVbSAN8r8GJHDsGlmNPXo+VeHkqAwCiQVTTx5/LwLZTcEw59z3DvcLbr0g==", + "dependencies": { + "find-up": "^6.3.0", + "read-pkg": "^8.0.0", + "type-fest": "^3.12.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dependencies": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", + "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", + "dependencies": { + "p-locate": "^6.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dependencies": { + "yocto-queue": "^1.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dependencies": { + "p-limit": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/redefine-property": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/redefine-property/-/redefine-property-2.0.0.tgz", + "integrity": "sha512-7UfHFiHkePd9mb/vYMPYuAPjAa/77xGQ1S6laaWNQkz5gVJAtYpoWYQ5iFL/ZcDxXZVqnD7N4aFFnIn4T36Sbw==", + "dependencies": { + "is-plain-obj": "^4.1.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/reduce-flatten": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", + "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", + "engines": { + "node": ">=6" + } + }, + "node_modules/regexp-tree": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", + "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", + "dev": true, + "bin": { + "regexp-tree": "bin/regexp-tree" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regjsparser": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz", + "integrity": "sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==", + "dev": true, + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/responselike": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", + "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", + "dependencies": { + "lowercase-keys": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-applescript": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", + "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "dev": true, + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/run-applescript/node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/run-applescript/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/run-applescript/node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/run-applescript/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/run-applescript/node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", + "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-json-value": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/safe-json-value/-/safe-json-value-2.0.1.tgz", + "integrity": "sha512-vvoBxKVyksxwqzNDoD2vLVkcvbjYBFXS/CghUrFDsrP0wgTaw+/gIyOADNYa1vyPmICLUWH7RNh0FtwmFsEQCQ==", + "dependencies": { + "is-plain-obj": "^4.1.0", + "normalize-exception": "^3.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-stable-stringify": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", + "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/sentence-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, + "node_modules/serialize-error": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "dev": true, + "dependencies": { + "type-fest": "^0.13.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/serialize-error/node_modules/type-fest": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/set-error-class": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-error-class/-/set-error-class-2.0.0.tgz", + "integrity": "sha512-ZBXDmoj+bWd+vJbA8VZE/aVQ6NL5iu2AVMtUyVIVXVMEi4oozCGPZAPjaJJZ4k8koLYb0OAFcyIRb0T6XiCuXg==", + "dependencies": { + "normalize-exception": "^3.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/set-error-message": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-error-message/-/set-error-message-2.0.1.tgz", + "integrity": "sha512-s/eeP0f4ed1S3fl0KbxZoy5Pbeg5D6Nbple9nut4VPwHTvEIk5r7vKq0FwjNjszdUPdlTrs4GJCOkWUqWeTeWg==", + "dependencies": { + "normalize-exception": "^3.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/set-error-props": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/set-error-props/-/set-error-props-5.0.0.tgz", + "integrity": "sha512-AKeNtJ7f9HUzB9Vw9KWiKKe6NR5b8hJoVVnXGN+ZkEj0jTfM0ggL+I2O/14zfJn9lgUqGgMgyjjRhldp7eTpeA==", + "dependencies": { + "is-error-instance": "^2.0.0", + "is-plain-obj": "^4.1.0", + "redefine-property": "^2.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/set-error-stack": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-error-stack/-/set-error-stack-2.0.0.tgz", + "integrity": "sha512-mABWr7mmaY1EVBMXWo32t6byRkKclJ3gipglE2+XGBZxDEk0+zVumRfWyAK3s/EB/TbbUm1Gp0H8VvqlFkMa+g==", + "dependencies": { + "normalize-exception": "^3.0.0" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", + "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==" + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", + "engines": { + "node": "*" + } + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supertap": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/supertap/-/supertap-3.0.1.tgz", + "integrity": "sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==", + "dev": true, + "dependencies": { + "indent-string": "^5.0.0", + "js-yaml": "^3.14.1", + "serialize-error": "^7.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/supertap/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/supertap/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/synckit": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", + "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", + "dev": true, + "dependencies": { + "@pkgr/utils": "^2.3.1", + "tslib": "^2.5.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/table-layout": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", + "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", + "dependencies": { + "array-back": "^4.0.1", + "deep-extend": "~0.6.0", + "typical": "^5.2.0", + "wordwrapjs": "^4.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/table-layout/node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/table-layout/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/temp-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", + "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==", + "dev": true, + "engines": { + "node": ">=14.16" + } + }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/time-zone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", + "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/titleize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", + "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/triple-beam": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", + "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/ts-api-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", + "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/ts-node": { + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true + }, + "node_modules/tsconfig-paths": { + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", + "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/typical": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", + "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/upper-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/upper-case-first": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/well-known-symbols": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz", + "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/winston": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.10.0.tgz", + "integrity": "sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g==", + "dependencies": { + "@colors/colors": "1.5.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.4.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.5.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-error-format": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/winston-error-format/-/winston-error-format-2.0.0.tgz", + "integrity": "sha512-1/x1VfKXef/6wFFeMsrdbjz44lJGHJHzy/VQe89oDE4CikRQ5Y31ewNt4u9g4+lpEbacPOtNAF2MPS0vxc+ZRQ==", + "dependencies": { + "error-serializer": "^6.0.1", + "is-error-instance": "^2.0.0", + "is-plain-obj": "^4.1.0", + "logform": "^2.5.1", + "normalize-exception": "^3.0.0", + "safe-json-value": "^2.0.1", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">=16.17.0" + }, + "peerDependencies": { + "winston": "^3.8.2" + } + }, + "node_modules/winston-transport": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz", + "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==", + "dependencies": { + "logform": "^2.3.2", + "readable-stream": "^3.6.0", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 6.4.0" + } + }, + "node_modules/winston/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/wordwrapjs": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", + "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", + "dependencies": { + "reduce-flatten": "^2.0.0", + "typical": "^5.2.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/wordwrapjs/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-error-message": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wrap-error-message/-/wrap-error-message-2.0.1.tgz", + "integrity": "sha512-LrBMsWJ85HKjLs5ABjhZeW7mWpwsAoV16iqmhEXUf4Y2GvdLwrqK4FPGNNoAi7a20wy4wHU2ci61wQfcOgz/Kw==", + "dependencies": { + "normalize-exception": "^3.0.0", + "set-error-message": "^2.0.1" + }, + "engines": { + "node": ">=16.17.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/write-file-atomic/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/plugins/source/airtable/package.json b/plugins/source/airtable/package.json new file mode 100644 index 00000000000000..200b77dad296a9 --- /dev/null +++ b/plugins/source/airtable/package.json @@ -0,0 +1,86 @@ +{ + "name": "@cloudquery/cq-source-airtable", + "version": "0.0.1", + "description": "A CloudQuery source plugin to sync data from Airtable", + "keywords": [ + "nodejs", + "javascript", + "CloudQuery", + "CQ", + "ETL", + "data", + "plugin", + "data extraction", + "data engineering", + "Airtable" + ], + "files": [ + "dist", + "!dist/**/*.test.*", + "!dist/tsconfig.tsbuildinfo", + "!dist/**/*.map" + ], + "bin": "dist/main.js", + "directories": { + "test": "test" + }, + "type": "module", + "scripts": { + "dev": "ts-node --esm src/main.ts serve", + "build": "rm -rf dist && tsc", + "format": "prettier --write 'src/**/*.ts'", + "format:check": "prettier --check 'src/**/*.ts'", + "lint": "eslint --max-warnings 0 --ext .ts src", + "lint:fix": "eslint --max-warnings 0 --ext .ts --fix src", + "test": "ava" + }, + "repository": { + "type": "git", + "url": "git+ssh://git@github.com/cloudquery/cloudquery.git" + }, + "author": "cloudquery (https://github.com/cloudquery)", + "license": "MPL-2.0", + "bugs": { + "url": "https://github.com/cloudquery/cloudquery/issues" + }, + "homepage": "https://github.com/cloudquery/cloudquery#readme", + "devDependencies": { + "@ava/typescript": "^4.1.0", + "@tsconfig/node16": "^16.1.0", + "@types/uuid": "^9.0.2", + "@types/yargs": "^17.0.24", + "@typescript-eslint/eslint-plugin": "^6.2.1", + "@typescript-eslint/parser": "^6.2.1", + "ava": "^5.3.1", + "eslint": "^8.46.0", + "eslint-config-prettier": "^9.0.0", + "eslint-config-standard": "^17.1.0", + "eslint-import-resolver-typescript": "^3.5.5", + "eslint-plugin-ava": "^14.0.0", + "eslint-plugin-import": "^2.28.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-unicorn": "^48.0.1", + "eslint-plugin-unused-imports": "^3.0.0", + "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0", + "prettier": "^3.0.1", + "ts-node": "^10.9.1", + "typescript": "^4.9.5" + }, + "engines": { + "node": ">=16.17.0" + }, + "dependencies": { + "@cloudquery/plugin-sdk-javascript": "^0.0.4", + "airtable": "^0.12.1", + "ajv": "^8.12.0", + "camelcase-keys": "^8.0.2", + "change-case": "^4.1.2", + "dayjs": "^1.11.9", + "dot-prop": "^8.0.2", + "got": "^13.0.0", + "p-map": "^6.0.0", + "read-pkg-up": "^10.0.0" + } +} diff --git a/plugins/source/airtable/src/airtable.ts b/plugins/source/airtable/src/airtable.ts new file mode 100644 index 00000000000000..88ba43897c6806 --- /dev/null +++ b/plugins/source/airtable/src/airtable.ts @@ -0,0 +1,878 @@ +// Based on https://airtable.com/api/meta +export type APIBase = { + id: string; + name: string; +}; + +export enum APIFieldType { + autoNumber = 'autoNumber', + barcode = 'barcode', + button = 'button', + checkbox = 'checkbox', + count = 'count', + createdBy = 'createdBy', + createdTime = 'createdTime', + currency = 'currency', + date = 'date', + dateTime = 'datetime', + duration = 'duration', + email = 'email', + externalSyncSource = 'externalSyncSource', + formula = 'formula', + lastModifiedBy = 'lastModifiedBy', + lastModifiedTime = 'lastModifiedTime', + multilineText = 'multilineText', + multipleAttachments = 'multipleAttachments', + multipleCollaborators = 'multipleCollaborators', + multipleLookupValues = 'multipleLookupValues', + multipleRecordLinks = 'multipleRecordLinks', + multipleSelects = 'multipleSelects', + number = 'number', + percent = 'percent', + phoneNumber = 'phoneNumber', + rating = 'rating', + richText = 'richText', + rollup = 'rollup', + singleCollaborator = 'singleCollaborator', + singleLineText = 'singleLineText', + singleSelect = 'singleSelect', + url = 'url', +} + +export type APIBaseField = { + id: string; + name: string; + description: string; + type: APIFieldType; +}; + +export type APIFieldNoOptions = APIBaseField & { + type: + | APIFieldType.autoNumber + | APIFieldType.barcode + | APIFieldType.button + | APIFieldType.createdBy + | APIFieldType.email + | APIFieldType.lastModifiedBy + | APIFieldType.multilineText + | APIFieldType.phoneNumber + | APIFieldType.richText + | APIFieldType.singleCollaborator + | APIFieldType.singleLineText + | APIFieldType.url; + options: undefined; +}; + +export type APIFieldCheckbox = APIBaseField & { + type: APIFieldType.checkbox; + options: { + icon: 'check' | 'xCheckbox' | 'star' | 'heart' | 'thumbsUp' | 'flag' | 'dot'; + color: + | 'greenBright' + | 'tealBright' + | 'cyanBright' + | 'blueBright' + | 'purpleBright' + | 'pinkBright' + | 'redBright' + | 'orangeBright' + | 'yellowBright' + | 'grayBright'; + }; +}; + +export type APIFieldCount = APIBaseField & { + type: APIFieldType.count; + options: { + // false when recordLinkFieldId is null, e.g. the referenced column was deleted. + isValid: boolean; + recordLinkFieldId: string | null; + }; +}; + +export type APIFieldCreatedTime = APIBaseField & { + type: APIFieldType.createdTime; + options: { + result: + | { + type: 'date'; + options: APIDateOptions; + } + | { + type: 'dateTime'; + options: APIDateTimeOptions; + }; + }; +}; + +export type APIFieldCurrency = APIBaseField & { + type: APIFieldType.currency; + options: { + // from 0 to 7 inclusive + precision: number; + symbol: string; + }; +}; + +export type APIDateOptions = { + dateFormat: { + name: 'local' | 'friendly' | 'us' | 'european' | 'iso'; + format: 'l' | 'LL' | 'M/D/YYYY' | 'D/M/YYYY' | 'YYYY-MM-DD'; + }; +}; + +export type APIDate = APIBaseField & { + type: APIFieldType.date; + options: APIDateOptions; +}; + +export type APIDateTimeOptions = { + dateFormat: { + name: 'local' | 'friendly' | 'us' | 'european' | 'iso'; + format: 'l' | 'LL' | 'M/D/YYYY' | 'D/M/YYYY' | 'YYYY-MM-DD'; + }; + timeFormat: { + name: '12hour' | '24hour'; + format: 'h:mma' | 'HH:mm'; + }; + timeZone: + | 'utc' + | 'client' + | 'Africa/Abidjan' + | 'Africa/Accra' + | 'Africa/Addis_Ababa' + | 'Africa/Algiers' + | 'Africa/Asmara' + | 'Africa/Bamako' + | 'Africa/Bangui' + | 'Africa/Banjul' + | 'Africa/Bissau' + | 'Africa/Blantyre' + | 'Africa/Brazzaville' + | 'Africa/Bujumbura' + | 'Africa/Cairo' + | 'Africa/Casablanca' + | 'Africa/Ceuta' + | 'Africa/Conakry' + | 'Africa/Dakar' + | 'Africa/Dar_es_Salaam' + | 'Africa/Djibouti' + | 'Africa/Douala' + | 'Africa/El_Aaiun' + | 'Africa/Freetown' + | 'Africa/Gaborone' + | 'Africa/Harare' + | 'Africa/Johannesburg' + | 'Africa/Juba' + | 'Africa/Kampala' + | 'Africa/Khartoum' + | 'Africa/Kigali' + | 'Africa/Kinshasa' + | 'Africa/Lagos' + | 'Africa/Libreville' + | 'Africa/Lome' + | 'Africa/Luanda' + | 'Africa/Lubumbashi' + | 'Africa/Lusaka' + | 'Africa/Malabo' + | 'Africa/Maputo' + | 'Africa/Maseru' + | 'Africa/Mbabane' + | 'Africa/Mogadishu' + | 'Africa/Monrovia' + | 'Africa/Nairobi' + | 'Africa/Ndjamena' + | 'Africa/Niamey' + | 'Africa/Nouakchott' + | 'Africa/Ouagadougou' + | 'Africa/Porto-Novo' + | 'Africa/Sao_Tome' + | 'Africa/Tripoli' + | 'Africa/Tunis' + | 'Africa/Windhoek' + | 'America/Adak' + | 'America/Anchorage' + | 'America/Anguilla' + | 'America/Antigua' + | 'America/Araguaina' + | 'America/Argentina/Buenos_Aires' + | 'America/Argentina/Catamarca' + | 'America/Argentina/Cordoba' + | 'America/Argentina/Jujuy' + | 'America/Argentina/La_Rioja' + | 'America/Argentina/Mendoza' + | 'America/Argentina/Rio_Gallegos' + | 'America/Argentina/Salta' + | 'America/Argentina/San_Juan' + | 'America/Argentina/San_Luis' + | 'America/Argentina/Tucuman' + | 'America/Argentina/Ushuaia' + | 'America/Aruba' + | 'America/Asuncion' + | 'America/Atikokan' + | 'America/Bahia' + | 'America/Bahia_Banderas' + | 'America/Barbados' + | 'America/Belem' + | 'America/Belize' + | 'America/Blanc-Sablon' + | 'America/Boa_Vista' + | 'America/Bogota' + | 'America/Boise' + | 'America/Cambridge_Bay' + | 'America/Campo_Grande' + | 'America/Cancun' + | 'America/Caracas' + | 'America/Cayenne' + | 'America/Cayman' + | 'America/Chicago' + | 'America/Chihuahua' + | 'America/Costa_Rica' + | 'America/Creston' + | 'America/Cuiaba' + | 'America/Curacao' + | 'America/Danmarkshavn' + | 'America/Dawson' + | 'America/Dawson_Creek' + | 'America/Denver' + | 'America/Detroit' + | 'America/Dominica' + | 'America/Edmonton' + | 'America/Eirunepe' + | 'America/El_Salvador' + | 'America/Fort_Nelson' + | 'America/Fortaleza' + | 'America/Glace_Bay' + | 'America/Godthab' + | 'America/Goose_Bay' + | 'America/Grand_Turk' + | 'America/Grenada' + | 'America/Guadeloupe' + | 'America/Guatemala' + | 'America/Guayaquil' + | 'America/Guyana' + | 'America/Halifax' + | 'America/Havana' + | 'America/Hermosillo' + | 'America/Indiana/Indianapolis' + | 'America/Indiana/Knox' + | 'America/Indiana/Marengo' + | 'America/Indiana/Petersburg' + | 'America/Indiana/Tell_City' + | 'America/Indiana/Vevay' + | 'America/Indiana/Vincennes' + | 'America/Indiana/Winamac' + | 'America/Inuvik' + | 'America/Iqaluit' + | 'America/Jamaica' + | 'America/Juneau' + | 'America/Kentucky/Louisville' + | 'America/Kentucky/Monticello' + | 'America/Kralendijk' + | 'America/La_Paz' + | 'America/Lima' + | 'America/Los_Angeles' + | 'America/Lower_Princes' + | 'America/Maceio' + | 'America/Managua' + | 'America/Manaus' + | 'America/Marigot' + | 'America/Martinique' + | 'America/Matamoros' + | 'America/Mazatlan' + | 'America/Menominee' + | 'America/Merida' + | 'America/Metlakatla' + | 'America/Mexico_City' + | 'America/Miquelon' + | 'America/Moncton' + | 'America/Monterrey' + | 'America/Montevideo' + | 'America/Montserrat' + | 'America/Nassau' + | 'America/New_York' + | 'America/Nipigon' + | 'America/Nome' + | 'America/Noronha' + | 'America/North_Dakota/Beulah' + | 'America/North_Dakota/Center' + | 'America/North_Dakota/New_Salem' + | 'America/Nuuk' + | 'America/Ojinaga' + | 'America/Panama' + | 'America/Pangnirtung' + | 'America/Paramaribo' + | 'America/Phoenix' + | 'America/Port-au-Prince' + | 'America/Port_of_Spain' + | 'America/Porto_Velho' + | 'America/Puerto_Rico' + | 'America/Punta_Arenas' + | 'America/Rainy_River' + | 'America/Rankin_Inlet' + | 'America/Recife' + | 'America/Regina' + | 'America/Resolute' + | 'America/Rio_Branco' + | 'America/Santarem' + | 'America/Santiago' + | 'America/Santo_Domingo' + | 'America/Sao_Paulo' + | 'America/Scoresbysund' + | 'America/Sitka' + | 'America/St_Barthelemy' + | 'America/St_Johns' + | 'America/St_Kitts' + | 'America/St_Lucia' + | 'America/St_Thomas' + | 'America/St_Vincent' + | 'America/Swift_Current' + | 'America/Tegucigalpa' + | 'America/Thule' + | 'America/Thunder_Bay' + | 'America/Tijuana' + | 'America/Toronto' + | 'America/Tortola' + | 'America/Vancouver' + | 'America/Whitehorse' + | 'America/Winnipeg' + | 'America/Yakutat' + | 'America/Yellowknife' + | 'Antarctica/Casey' + | 'Antarctica/Davis' + | 'Antarctica/DumontDUrville' + | 'Antarctica/Macquarie' + | 'Antarctica/Mawson' + | 'Antarctica/McMurdo' + | 'Antarctica/Palmer' + | 'Antarctica/Rothera' + | 'Antarctica/Syowa' + | 'Antarctica/Troll' + | 'Antarctica/Vostok' + | 'Arctic/Longyearbyen' + | 'Asia/Aden' + | 'Asia/Almaty' + | 'Asia/Amman' + | 'Asia/Anadyr' + | 'Asia/Aqtau' + | 'Asia/Aqtobe' + | 'Asia/Ashgabat' + | 'Asia/Atyrau' + | 'Asia/Baghdad' + | 'Asia/Bahrain' + | 'Asia/Baku' + | 'Asia/Bangkok' + | 'Asia/Barnaul' + | 'Asia/Beirut' + | 'Asia/Bishkek' + | 'Asia/Brunei' + | 'Asia/Chita' + | 'Asia/Choibalsan' + | 'Asia/Colombo' + | 'Asia/Damascus' + | 'Asia/Dhaka' + | 'Asia/Dili' + | 'Asia/Dubai' + | 'Asia/Dushanbe' + | 'Asia/Famagusta' + | 'Asia/Gaza' + | 'Asia/Hebron' + | 'Asia/Ho_Chi_Minh' + | 'Asia/Hong_Kong' + | 'Asia/Hovd' + | 'Asia/Irkutsk' + | 'Asia/Istanbul' + | 'Asia/Jakarta' + | 'Asia/Jayapura' + | 'Asia/Jerusalem' + | 'Asia/Kabul' + | 'Asia/Kamchatka' + | 'Asia/Karachi' + | 'Asia/Kathmandu' + | 'Asia/Khandyga' + | 'Asia/Kolkata' + | 'Asia/Krasnoyarsk' + | 'Asia/Kuala_Lumpur' + | 'Asia/Kuching' + | 'Asia/Kuwait' + | 'Asia/Macau' + | 'Asia/Magadan' + | 'Asia/Makassar' + | 'Asia/Manila' + | 'Asia/Muscat' + | 'Asia/Nicosia' + | 'Asia/Novokuznetsk' + | 'Asia/Novosibirsk' + | 'Asia/Omsk' + | 'Asia/Oral' + | 'Asia/Phnom_Penh' + | 'Asia/Pontianak' + | 'Asia/Pyongyang' + | 'Asia/Qatar' + | 'Asia/Qostanay' + | 'Asia/Qyzylorda' + | 'Asia/Rangoon' + | 'Asia/Riyadh' + | 'Asia/Sakhalin' + | 'Asia/Samarkand' + | 'Asia/Seoul' + | 'Asia/Shanghai' + | 'Asia/Singapore' + | 'Asia/Srednekolymsk' + | 'Asia/Taipei' + | 'Asia/Tashkent' + | 'Asia/Tbilisi' + | 'Asia/Tehran' + | 'Asia/Thimphu' + | 'Asia/Tokyo' + | 'Asia/Tomsk' + | 'Asia/Ulaanbaatar' + | 'Asia/Urumqi' + | 'Asia/Ust-Nera' + | 'Asia/Vientiane' + | 'Asia/Vladivostok' + | 'Asia/Yakutsk' + | 'Asia/Yangon' + | 'Asia/Yekaterinburg' + | 'Asia/Yerevan' + | 'Atlantic/Azores' + | 'Atlantic/Bermuda' + | 'Atlantic/Canary' + | 'Atlantic/Cape_Verde' + | 'Atlantic/Faroe' + | 'Atlantic/Madeira' + | 'Atlantic/Reykjavik' + | 'Atlantic/South_Georgia' + | 'Atlantic/St_Helena' + | 'Atlantic/Stanley' + | 'Australia/Adelaide' + | 'Australia/Brisbane' + | 'Australia/Broken_Hill' + | 'Australia/Currie' + | 'Australia/Darwin' + | 'Australia/Eucla' + | 'Australia/Hobart' + | 'Australia/Lindeman' + | 'Australia/Lord_Howe' + | 'Australia/Melbourne' + | 'Australia/Perth' + | 'Australia/Sydney' + | 'Europe/Amsterdam' + | 'Europe/Andorra' + | 'Europe/Astrakhan' + | 'Europe/Athens' + | 'Europe/Belgrade' + | 'Europe/Berlin' + | 'Europe/Bratislava' + | 'Europe/Brussels' + | 'Europe/Bucharest' + | 'Europe/Budapest' + | 'Europe/Busingen' + | 'Europe/Chisinau' + | 'Europe/Copenhagen' + | 'Europe/Dublin' + | 'Europe/Gibraltar' + | 'Europe/Guernsey' + | 'Europe/Helsinki' + | 'Europe/Isle_of_Man' + | 'Europe/Istanbul' + | 'Europe/Jersey' + | 'Europe/Kaliningrad' + | 'Europe/Kiev' + | 'Europe/Kirov' + | 'Europe/Lisbon' + | 'Europe/Ljubljana' + | 'Europe/London' + | 'Europe/Luxembourg' + | 'Europe/Madrid' + | 'Europe/Malta' + | 'Europe/Mariehamn' + | 'Europe/Minsk' + | 'Europe/Monaco' + | 'Europe/Moscow' + | 'Europe/Nicosia' + | 'Europe/Oslo' + | 'Europe/Paris' + | 'Europe/Podgorica' + | 'Europe/Prague' + | 'Europe/Riga' + | 'Europe/Rome' + | 'Europe/Samara' + | 'Europe/San_Marino' + | 'Europe/Sarajevo' + | 'Europe/Saratov' + | 'Europe/Simferopol' + | 'Europe/Skopje' + | 'Europe/Sofia' + | 'Europe/Stockholm' + | 'Europe/Tallinn' + | 'Europe/Tirane' + | 'Europe/Ulyanovsk' + | 'Europe/Uzhgorod' + | 'Europe/Vaduz' + | 'Europe/Vatican' + | 'Europe/Vienna' + | 'Europe/Vilnius' + | 'Europe/Volgograd' + | 'Europe/Warsaw' + | 'Europe/Zagreb' + | 'Europe/Zaporozhye' + | 'Europe/Zurich' + | 'Indian/Antananarivo' + | 'Indian/Chagos' + | 'Indian/Christmas' + | 'Indian/Cocos' + | 'Indian/Comoro' + | 'Indian/Kerguelen' + | 'Indian/Mahe' + | 'Indian/Maldives' + | 'Indian/Mauritius' + | 'Indian/Mayotte' + | 'Indian/Reunion' + | 'Pacific/Apia' + | 'Pacific/Auckland' + | 'Pacific/Bougainville' + | 'Pacific/Chatham' + | 'Pacific/Chuuk' + | 'Pacific/Easter' + | 'Pacific/Efate' + | 'Pacific/Enderbury' + | 'Pacific/Fakaofo' + | 'Pacific/Fiji' + | 'Pacific/Funafuti' + | 'Pacific/Galapagos' + | 'Pacific/Gambier' + | 'Pacific/Guadalcanal' + | 'Pacific/Guam' + | 'Pacific/Honolulu' + | 'Pacific/Kanton' + | 'Pacific/Kiritimati' + | 'Pacific/Kosrae' + | 'Pacific/Kwajalein' + | 'Pacific/Majuro' + | 'Pacific/Marquesas' + | 'Pacific/Midway' + | 'Pacific/Nauru' + | 'Pacific/Niue' + | 'Pacific/Norfolk' + | 'Pacific/Noumea' + | 'Pacific/Pago_Pago' + | 'Pacific/Palau' + | 'Pacific/Pitcairn' + | 'Pacific/Pohnpei' + | 'Pacific/Port_Moresby' + | 'Pacific/Rarotonga' + | 'Pacific/Saipan' + | 'Pacific/Tahiti' + | 'Pacific/Tarawa' + | 'Pacific/Tongatapu' + | 'Pacific/Wake' + | 'Pacific/Wallis'; +}; + +export type APIDateTime = APIBaseField & { + type: APIFieldType.dateTime; + options: APIDateTimeOptions; +}; + +export type APIDuration = APIBaseField & { + type: APIFieldType.duration; + options: { + durationFormat: 'h:mm' | 'h:mm:ss' | 'h:mm:ss.S' | 'h:mm:ss.SS' | 'h:mm:ss.SSS'; + }; +}; + +export type APIExternalSyncSource = APIBaseField & { + type: APIFieldType.externalSyncSource; + options: { + choices: Array<{ + id: string; + name: string; + color?: + | 'blueLight2' + | 'cyanLight2' + | 'tealLight2' + | 'greenLight2' + | 'yellowLight2' + | 'orangeLight2' + | 'redLight2' + | 'pinkLight2' + | 'purpleLight2' + | 'grayLight2' + | 'blueLight1' + | 'cyanLight1' + | 'tealLight1' + | 'greenLight1' + | 'yellowLight1' + | 'orangeLight1' + | 'redLight1' + | 'pinkLight1' + | 'purpleLight1' + | 'grayLight1' + | 'blueBright' + | 'cyanBright' + | 'tealBright' + | 'greenBright' + | 'yellowBright' + | 'orangeBright' + | 'redBright' + | 'pinkBright' + | 'purpleBright' + | 'grayBright' + | 'blueDark1' + | 'cyanDark1' + | 'tealDark1' + | 'greenDark1' + | 'yellowDark1' + | 'orangeDark1' + | 'redDark1' + | 'pinkDark1' + | 'purpleDark1' + | 'grayDark1'; + }>; + }; +}; + +export type APIFieldFormula = APIBaseField & { + type: APIFieldType.formula; + options: { + isValid: boolean; + referencedFieldIds: Array; + // `result` contains the type and field options of the evaluated field type, or null if the formula is invalid. + result: APIField | null; + }; +}; + +export type APILastModifiedTime = APIBaseField & { + type: APIFieldType.lastModifiedTime; + options: { + isValid: boolean; + referencedFieldIds: Array; + result: + | { + type: 'date'; + options: APIDateOptions; + } + | { + type: 'dateTime'; + options: APIDateTimeOptions; + }; + }; +}; + +export type APIMultipleAttachments = APIBaseField & { + type: APIFieldType.multipleAttachments; + options: { + // Whether attachments are rendered in the reverse order from the cell value in the Airtable UI (i.e. most recent first). You generally do not need to rely on this option. + isReversed: boolean; + }; +}; + +export type APIMultipleLookupValues = APIBaseField & { + type: APIFieldType.multipleLookupValues; + options: { + isValid: boolean; + // The linked field id + recordLinkFieldId: string; + // The id of the field in the linked table + fieldIdInLinkedTable: string; + // `result` contains the type and field options of the evaluated field type, or null if the lookup is invalid. + result: unknown; + }; +}; + +export type APIMultipleRecordLinks = APIBaseField & { + type: APIFieldType.multipleRecordLinks; + options: { + // Whether attachments are rendered in the reverse order from the cell value in the Airtable UI (i.e. most recent first). You generally do not need to rely on this option. + isReversed: boolean; + inverseLinkFieldId?: string; + linkedTableId: string; + viewIdForRecordSelection?: string; + // Whether this field prefers to only have a single linked record. While this preference is enforced in the Airtable UI, it is possible for a field that prefers single linked records to have multiple record links (for example, via copy-and-paste or programmatic updates). + prefersSingleRecordLink: boolean; + }; +}; + +export type APIMultipleSelects = APIBaseField & { + type: APIFieldType.multipleSelects; + options: { + choices: Array<{ + id: string; + name: string; + color?: + | 'blueLight2' + | 'cyanLight2' + | 'tealLight2' + | 'greenLight2' + | 'yellowLight2' + | 'orangeLight2' + | 'redLight2' + | 'pinkLight2' + | 'purpleLight2' + | 'grayLight2' + | 'blueLight1' + | 'cyanLight1' + | 'tealLight1' + | 'greenLight1' + | 'yellowLight1' + | 'orangeLight1' + | 'redLight1' + | 'pinkLight1' + | 'purpleLight1' + | 'grayLight1' + | 'blueBright' + | 'cyanBright' + | 'tealBright' + | 'greenBright' + | 'yellowBright' + | 'orangeBright' + | 'redBright' + | 'pinkBright' + | 'purpleBright' + | 'grayBright' + | 'blueDark1' + | 'cyanDark1' + | 'tealDark1' + | 'greenDark1' + | 'yellowDark1' + | 'orangeDark1' + | 'redDark1' + | 'pinkDark1' + | 'purpleDark1' + | 'grayDark1'; + }>; + }; +}; + +export type APINumber = APIBaseField & { + type: APIFieldType.number; + options: { + // from 0 to 8 inclusive + precision: number; + }; +}; + +export type APIPercent = APIBaseField & { + type: APIFieldType.percent; + options: { + // from 0 to 8 inclusive + precision: number; + }; +}; + +export type APIRating = APIBaseField & { + type: APIFieldType.rating; + options: { + color: + | 'yellowBright' + | 'orangeBright' + | 'redBright' + | 'pinkBright' + | 'purpleBright' + | 'blueBright' + | 'cyanBright' + | 'tealBright' + | 'greenBright' + | 'grayBright'; + icon: 'star' | 'heart' | 'thumbsUp' | 'flag' | 'dot'; + // from 1 to 10 inclusive + max: number; + }; +}; + +export type APIRollup = APIBaseField & { + type: APIFieldType.rollup; + options: { + isValid: boolean; + // The linked field id + recordLinkFieldId: string; + // The id of the field in the linked table + fieldIdInLinkedTable: string; + // The ids of any fields referenced in the rollup formula + referencedFieldIds: Array; + // `result` contains the type and field options of the evaluated field type. + result: unknown; + }; +}; + +export type APIFieldSingleSelect = APIBaseField & { + type: APIFieldType.singleSelect; + options: { + choices: Array<{ + id: string; + name: string; + color?: + | 'blueLight2' + | 'cyanLight2' + | 'tealLight2' + | 'greenLight2' + | 'yellowLight2' + | 'orangeLight2' + | 'redLight2' + | 'pinkLight2' + | 'purpleLight2' + | 'grayLight2' + | 'blueLight1' + | 'cyanLight1' + | 'tealLight1' + | 'greenLight1' + | 'yellowLight1' + | 'orangeLight1' + | 'redLight1' + | 'pinkLight1' + | 'purpleLight1' + | 'grayLight1' + | 'blueBright' + | 'cyanBright' + | 'tealBright' + | 'greenBright' + | 'yellowBright' + | 'orangeBright' + | 'redBright' + | 'pinkBright' + | 'purpleBright' + | 'grayBright' + | 'blueDark1' + | 'cyanDark1' + | 'tealDark1' + | 'greenDark1' + | 'yellowDark1' + | 'orangeDark1' + | 'redDark1' + | 'pinkDark1' + | 'purpleDark1' + | 'grayDark1'; + }>; + }; +}; + +export type APIField = + | APIFieldNoOptions + | APIFieldCheckbox + | APIFieldCount + | APIFieldCreatedTime + | APIFieldCurrency + | APIDate + | APIDateTime + | APIDuration + | APIExternalSyncSource + | APIFieldFormula + | APILastModifiedTime + | APIMultipleAttachments + | APIMultipleLookupValues + | APIMultipleRecordLinks + | APIMultipleSelects + | APINumber + | APIPercent + | APIRating + | APIRollup + | APIFieldSingleSelect; + +export type APITable = { + id: string; + name: string; + description: string; + primaryFieldId: string; + fields: APIField[]; +}; diff --git a/plugins/source/airtable/src/main.ts b/plugins/source/airtable/src/main.ts new file mode 100644 index 00000000000000..dccdb1443003f4 --- /dev/null +++ b/plugins/source/airtable/src/main.ts @@ -0,0 +1,9 @@ +import { createServeCommand } from '@cloudquery/plugin-sdk-javascript/plugin/serve'; + +import { newAirtablePlugin } from './plugin.js'; + +const main = () => { + createServeCommand(newAirtablePlugin()).parse(); +}; + +main(); diff --git a/plugins/source/airtable/src/plugin.ts b/plugins/source/airtable/src/plugin.ts new file mode 100644 index 00000000000000..37d7c365b00478 --- /dev/null +++ b/plugins/source/airtable/src/plugin.ts @@ -0,0 +1,76 @@ +import type { + NewClientFunction, + TableOptions, + SyncOptions, + Plugin, +} from '@cloudquery/plugin-sdk-javascript/plugin/plugin'; +import { newPlugin, newUnimplementedDestination } from '@cloudquery/plugin-sdk-javascript/plugin/plugin'; +import { sync } from '@cloudquery/plugin-sdk-javascript/scheduler'; +import type { Table } from '@cloudquery/plugin-sdk-javascript/schema/table'; +import { filterTables } from '@cloudquery/plugin-sdk-javascript/schema/table'; +import { readPackageUp } from 'read-pkg-up'; + +import { parseSpec } from './spec.js'; +import type { Spec } from './spec.js'; +import { getTables } from './tables.js'; + +const { + packageJson: { version }, +} = (await readPackageUp()) || { packageJson: { version: 'development' } }; + +type AirtableClient = { + id: () => string; +}; + +export const newAirtablePlugin = () => { + const pluginClient = { + ...newUnimplementedDestination(), + plugin: null as unknown as Plugin, + spec: null as unknown as Spec, + client: null as unknown as AirtableClient | null, + allTables: null as unknown as Table[], + close: () => Promise.resolve(), + tables: ({ tables, skipTables, skipDependentTables }: TableOptions) => { + const { allTables } = pluginClient; + const filtered = filterTables(allTables, tables, skipTables, skipDependentTables); + return Promise.resolve(filtered); + }, + sync: (options: SyncOptions) => { + const { client, allTables, plugin } = pluginClient; + + if (client === null) { + return Promise.reject(new Error('Client not initialized')); + } + + const logger = plugin.getLogger(); + const { + spec: { concurrency }, + } = pluginClient; + + const { stream, tables, skipTables, skipDependentTables, deterministicCQId } = options; + const filtered = filterTables(allTables, tables, skipTables, skipDependentTables); + + return sync({ + logger, + client, + stream, + tables: filtered, + deterministicCQId, + concurrency, + }); + }, + }; + + const newClient: NewClientFunction = async (logger, spec, { noConnection }) => { + pluginClient.spec = parseSpec(spec); + pluginClient.client = { id: () => 'airtable' }; + pluginClient.allTables = noConnection + ? [] + : await getTables(pluginClient.spec.apiKey, pluginClient.spec.endpointUrl, pluginClient.spec.concurrency); + + return pluginClient; + }; + + pluginClient.plugin = newPlugin('airtable', version, newClient); + return pluginClient.plugin; +}; diff --git a/plugins/source/airtable/src/spec.ts b/plugins/source/airtable/src/spec.ts new file mode 100644 index 00000000000000..f57991a553a3bc --- /dev/null +++ b/plugins/source/airtable/src/spec.ts @@ -0,0 +1,41 @@ +import { default as Ajv } from 'ajv'; +import camelcaseKeys from 'camelcase-keys'; + +const spec = { + type: 'object', + properties: { + concurrency: { type: 'integer' }, + // eslint-disable-next-line @typescript-eslint/naming-convention + api_key: { type: 'string' }, + // eslint-disable-next-line @typescript-eslint/naming-convention + endpoint_url: { type: 'string' }, + }, + required: ['api_key'], +}; + +type JSONSpec = { + concurrency: number; + // eslint-disable-next-line @typescript-eslint/naming-convention + api_key: string; + // eslint-disable-next-line @typescript-eslint/naming-convention + endpoint_url: string; +}; + +const ajv = new Ajv.default(); +const validate = ajv.compile(spec); + +export type Spec = { + concurrency: number; + apiKey: string; + endpointUrl: string; +}; + +export const parseSpec = (spec: string): Spec => { + const parsed = JSON.parse(spec) as Partial; + const valid = validate(parsed); + if (!valid) { + throw new Error(`Invalid spec: ${JSON.stringify(validate.errors)}`); + } + const { concurrency = 10_000, apiKey = '', endpointUrl = 'https://api.airtable.com' } = camelcaseKeys(parsed); + return { concurrency, apiKey, endpointUrl }; +}; diff --git a/plugins/source/airtable/src/tables.ts b/plugins/source/airtable/src/tables.ts new file mode 100644 index 00000000000000..7a5425590496c8 --- /dev/null +++ b/plugins/source/airtable/src/tables.ts @@ -0,0 +1,283 @@ +import type { DataType } from '@cloudquery/plugin-sdk-javascript/arrow'; +import { + Utf8, + Timestamp, + Date_, + DateUnit, + TimeUnit, + Float64, + Bool, + Int64, + Uint64, +} from '@cloudquery/plugin-sdk-javascript/arrow'; +import type { ColumnResolver } from '@cloudquery/plugin-sdk-javascript/schema/column'; +import { createColumn } from '@cloudquery/plugin-sdk-javascript/schema/column'; +import { pathResolver } from '@cloudquery/plugin-sdk-javascript/schema/resolvers'; +import type { Table, TableResolver } from '@cloudquery/plugin-sdk-javascript/schema/table'; +import { createTable } from '@cloudquery/plugin-sdk-javascript/schema/table'; +import { JSONType } from '@cloudquery/plugin-sdk-javascript/types/json'; +import Airtable from 'airtable'; +import { snakeCase } from 'change-case'; +import dayjs from 'dayjs'; +import customParseFormat from 'dayjs/plugin/customParseFormat.js'; +import localizedFormat from 'dayjs/plugin/localizedFormat.js'; +import timezone from 'dayjs/plugin/timezone.js'; +import utc from 'dayjs/plugin/utc.js'; +import { getProperty } from 'dot-prop'; +import { got } from 'got'; +import pMap from 'p-map'; + +import type { APIField, APITable, APIBase, APIFieldFormula } from './airtable.js'; +import { APIFieldType } from './airtable.js'; + +/* eslint-disable import/no-named-as-default-member */ +dayjs.extend(utc); +dayjs.extend(timezone); +dayjs.extend(customParseFormat); +dayjs.extend(localizedFormat); +/* eslint-enable import/no-named-as-default-member */ + +const timeout = { + request: 10_000, +}; + +const options = (apiKey: string) => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + headers: { Authorization: `Bearer ${apiKey}` }, + timeout, +}); + +const getBases = (apiKey: string, endpointURL: string) => { + return got(`${endpointURL}/v0/meta/bases`, options(apiKey)).json(); +}; + +const getBaseTables = async (apiKey: string, endpointURL: string, baseId: string) => { + const { tables } = (await got(`${endpointURL}/v0/meta/bases/${baseId}/tables`, options(apiKey)).json()) as { + tables: APITable[]; + }; + return tables; +}; + +const airtableFieldToArrowField = (field: APIField): DataType => { + switch (field.type) { + case APIFieldType.checkbox: { + return new Bool(); + } + case APIFieldType.barcode: + case APIFieldType.count: + case APIFieldType.currency: + case APIFieldType.externalSyncSource: + case APIFieldType.multipleAttachments: + case APIFieldType.multipleLookupValues: + case APIFieldType.multipleRecordLinks: + case APIFieldType.multipleSelects: + case APIFieldType.rating: + case APIFieldType.rollup: + case APIFieldType.singleCollaborator: { + return new JSONType(); + } + case APIFieldType.createdTime: + case APIFieldType.lastModifiedTime: { + switch (field.options.result.type) { + case 'date': { + return new Date_(DateUnit.DAY); + } + case 'dateTime': { + return new Timestamp(TimeUnit.NANOSECOND); + } + default: { + throw new Error(`Unknown createdTime result: ${JSON.stringify(field.options.result)}`); + } + } + } + // We don't use the Arrow Date type because most destinations don't support it + case APIFieldType.date: + case APIFieldType.dateTime: { + return new Timestamp(TimeUnit.NANOSECOND); + } + // The duration in Airtable is saved in the format of `s.m` where `s` is the number of seconds and `m` is the number of milliseconds + // For example `4980.123` means 4980 seconds and 123 milliseconds which is 1 hour, 23 minutes and 0.123 seconds + case APIFieldType.duration: { + return new Float64(); + } + case APIFieldType.autoNumber: { + return new Uint64(); + } + case APIFieldType.number: { + if (field.options.precision === 0) { + return new Int64(); + } + return new Float64(); + } + case APIFieldType.percent: { + return new Float64(); + } + case APIFieldType.formula: { + const formulaField = field as APIFieldFormula; + if (formulaField.options.result !== null) { + return airtableFieldToArrowField(formulaField.options.result); + } + return new Utf8(); + } + default: { + return new Utf8(); + } + } +}; + +const normalizeDateFormat = (format: string) => { + if (format === 'l' || format === 'LL') { + return 'YYYY-MM-DD'; + } + return format; +}; + +const getColumnResolver = (field: APIField): ColumnResolver => { + switch (field.type) { + case APIFieldType.createdTime: + case APIFieldType.lastModifiedTime: { + const resolver: ColumnResolver = (client, resource, column) => { + const data = getProperty(resource.getItem(), field.name); + if (!data) { + return Promise.resolve(resource.setColumData(column.name, null)); + } + + const dateFormat = normalizeDateFormat(field.options.result.options.dateFormat.format); + if (field.options.result.type === 'date') { + const formatted = dayjs(data, dateFormat).toDate(); + return Promise.resolve(resource.setColumData(column.name, formatted)); + } + + const timeFormat = field.options.result.options.timeFormat.format; + const format = `${dateFormat} ${timeFormat}`; + const formatted = dayjs.tz(data, format, field.options.result.options.timeZone).toDate(); + return Promise.resolve(resource.setColumData(column.name, formatted)); + }; + return resolver; + } + case APIFieldType.date: { + const resolver: ColumnResolver = (client, resource, column) => { + const data = getProperty(resource.getItem(), field.name); + if (!data) { + return Promise.resolve(resource.setColumData(column.name, null)); + } + + const dateFormat = normalizeDateFormat(field.options.dateFormat.format); + const formatted = dayjs(data, dateFormat).toDate(); + return Promise.resolve(resource.setColumData(column.name, formatted)); + }; + return resolver; + } + case APIFieldType.dateTime: { + const resolver: ColumnResolver = (client, resource, column) => { + const data = getProperty(resource.getItem(), field.name); + if (!data) { + return Promise.resolve(resource.setColumData(column.name, null)); + } + + const dateFormat = normalizeDateFormat(field.options.dateFormat.format); + const timeFormat = field.options.timeFormat.format; + const format = `${dateFormat} ${timeFormat}`; + const formatted = dayjs.tz(data, format, field.options.timeZone).toDate(); + return Promise.resolve(resource.setColumData(column.name, formatted)); + }; + return resolver; + } + case APIFieldType.currency: { + const resolver: ColumnResolver = (client, resource, column) => { + const data = getProperty(resource.getItem(), field.name); + if (!data) { + return Promise.resolve(resource.setColumData(column.name, null)); + } + + const withCurrencySymbol = { + symbol: field.options.symbol, + value: data, + }; + return Promise.resolve(resource.setColumData(column.name, withCurrencySymbol)); + }; + return resolver; + } + case APIFieldType.rating: { + const resolver: ColumnResolver = (client, resource, column) => { + const data = getProperty(resource.getItem(), field.name); + if (!data) { + return Promise.resolve(resource.setColumData(column.name, null)); + } + + const withMaxValue = { + max: field.options.max, + value: data, + }; + return Promise.resolve(resource.setColumData(column.name, withMaxValue)); + }; + return resolver; + } + case APIFieldType.formula: { + const formulaField = field as APIFieldFormula; + if (formulaField.options.result !== null) { + return getColumnResolver({ ...field, ...formulaField.options.result }); + } + return pathResolver(field.name); + } + default: { + return pathResolver(field.name); + } + } +}; + +const fieldToSchemaColumn = (field: APIField) => { + const { name } = field; + const normalizedName = snakeCase(name); + return createColumn({ + name: normalizedName, + type: airtableFieldToArrowField(field), + resolver: getColumnResolver(field), + }); +}; + +const airtableToSchemaTable = ( + apiKey: string, + endpointUrl: string, + baseId: string, + baseName: string, + table: APITable, +) => { + // Airtable base names are not unique, so we use the base id for uniqueness of table names + // Airtable table names are unique within a base, so we use the Airtable table name as the table name + const name = [baseId.toLowerCase(), snakeCase(baseName), snakeCase(table.name)].join('__'); + const columns = table.fields.map((field) => fieldToSchemaColumn(field)); + + const resolver: TableResolver = async (clientMeta, parent, stream) => { + const airtableClient = new Airtable({ apiKey, endpointUrl }).base(baseId); + const records = await airtableClient(table.name).select().all(); + for (const record of records) { + const recordAsObject = Object.fromEntries(table.fields.map((field) => [field.name, record.get(field.name)])); + stream.write(recordAsObject); + } + return; + }; + + return createTable({ name, columns, description: table.description, resolver }); +}; + +export const getTables = async (apiKey: string, endpointUrl: string, concurrency: number): Promise => { + const { bases } = (await getBases(apiKey, endpointUrl)) as { bases: APIBase[] }; + + const allTables = await pMap( + bases, + async ({ id: baseId, name: baseName }) => { + const tables = await getBaseTables(apiKey, endpointUrl, baseId); + return { baseId, baseName, tables }; + }, + { + concurrency, + }, + ); + + const schemaTables = allTables.map(({ tables, baseId, baseName }) => + tables.map((table) => airtableToSchemaTable(apiKey, endpointUrl, baseId, baseName, table)), + ); + + return schemaTables.flat(); +}; diff --git a/plugins/source/airtable/tsconfig.json b/plugins/source/airtable/tsconfig.json new file mode 100644 index 00000000000000..995e24e2dfa268 --- /dev/null +++ b/plugins/source/airtable/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "@tsconfig/node16/tsconfig.json", + "compilerOptions": { + "allowJs": true, + "declaration": true, + "outDir": "dist", + "sourceMap": true + } +} diff --git a/release-please-config.json b/release-please-config.json index f81340ad6d571e..ceb57856f480b1 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -64,6 +64,10 @@ "plugins/destination/test": { "component": "plugins-destination-test" }, + "plugins/source/airtable": { + "component": "plugins-source-airtable", + "release-type": "node" + }, "plugins/source/alicloud": { "component": "plugins-source-alicloud" }, From 5d9b33c6f706360f138788b350b52c9d8c205ae4 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Thu, 17 Aug 2023 11:47:29 +0200 Subject: [PATCH 79/87] fix: Rename spec option from `api_key` to `access_token` (#13165) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Summary The Airtable JS SDK calls it API key, but the official term is access token --- plugins/source/airtable/src/spec.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/source/airtable/src/spec.ts b/plugins/source/airtable/src/spec.ts index f57991a553a3bc..c77a2f971cc186 100644 --- a/plugins/source/airtable/src/spec.ts +++ b/plugins/source/airtable/src/spec.ts @@ -6,17 +6,17 @@ const spec = { properties: { concurrency: { type: 'integer' }, // eslint-disable-next-line @typescript-eslint/naming-convention - api_key: { type: 'string' }, + access_token: { type: 'string' }, // eslint-disable-next-line @typescript-eslint/naming-convention endpoint_url: { type: 'string' }, }, - required: ['api_key'], + required: ['access_token'], }; type JSONSpec = { concurrency: number; // eslint-disable-next-line @typescript-eslint/naming-convention - api_key: string; + access_token: string; // eslint-disable-next-line @typescript-eslint/naming-convention endpoint_url: string; }; @@ -36,6 +36,6 @@ export const parseSpec = (spec: string): Spec => { if (!valid) { throw new Error(`Invalid spec: ${JSON.stringify(validate.errors)}`); } - const { concurrency = 10_000, apiKey = '', endpointUrl = 'https://api.airtable.com' } = camelcaseKeys(parsed); - return { concurrency, apiKey, endpointUrl }; + const { concurrency = 10_000, accessToken = '', endpointUrl = 'https://api.airtable.com' } = camelcaseKeys(parsed); + return { concurrency, apiKey: accessToken, endpointUrl }; }; From 87d27dc1544782e8fc84830a93dc1d015ddd446f Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Thu, 17 Aug 2023 11:02:11 +0100 Subject: [PATCH 80/87] doc: Python SDK Announcement blog (#12752) --- .github/styles/Vocab/Base/accept.txt | 1 + .../blog/announcing-cloudquery-python-sdk.mdx | 146 ++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 website/pages/blog/announcing-cloudquery-python-sdk.mdx diff --git a/.github/styles/Vocab/Base/accept.txt b/.github/styles/Vocab/Base/accept.txt index fc92273ec240e2..ea3b11f4d416c3 100644 --- a/.github/styles/Vocab/Base/accept.txt +++ b/.github/styles/Vocab/Base/accept.txt @@ -194,6 +194,7 @@ runtime runtimes Scaleway schemaless +scheduler's SCP SCPs sdk diff --git a/website/pages/blog/announcing-cloudquery-python-sdk.mdx b/website/pages/blog/announcing-cloudquery-python-sdk.mdx new file mode 100644 index 00000000000000..66b53f4b36fc11 --- /dev/null +++ b/website/pages/blog/announcing-cloudquery-python-sdk.mdx @@ -0,0 +1,146 @@ +--- +title: Announcing the Python SDK for CloudQuery Plugin Development +tag: announcement +date: 2023/08/17 +description: +author: hermanschaaf +--- + +import { BlogHeader } from "../../components/BlogHeader" + + + +We're excited to announce the first release of a Python SDK for CloudQuery plugin development! This SDK provides a high-level toolkit for developing CloudQuery plugins in Python. + +## Background + +CloudQuery is designed with a pluggable architecture and uses [Apache Arrow](https://arrow.apache.org/) over [gRPC](https://grpc.io/) for communication between plugins. Source and destination plugins are independent of one another, and this architecture allows plugins to be written in different languages but still communicate with one another. Until now, we've only provided an SDK for writing plugins in Go, but we're excited to announce that we now have an SDK for writing plugins in Python as well. + +![cloudquery high-level architecture](/images/cloudquery-architecture.png) + +## Features + +The Python SDK provides a number of features to make plugin development easier, and make plugins written in Python performant. + +### Plugin Server + +The most basic functionality provided by the Python SDK is to start a gRPC plugin server that supports all the flags expected by the CloudQuery CLI. This allows you to write a plugin in Python and run it using the same command line interface as any other plugin. + +The following example shows how to create a plugin server that runs a plugin called `MyPlugin`: + +```python +import sys +from cloudquery.sdk import serve + +from plugin import MyPlugin + + +def main(): + p = MyPlugin() + serve.PluginCommand(p).run(sys.argv[1:]) + + +if __name__ == "__main__": + main() +``` + +Here `MyPlugin` is a class that extends `cloudquery.sdk.plugin.Plugin`. We'll look at the `Plugin` class in more detail next. + +### Plugin Class + +A CloudQuery Python source plugin, like `MyPlugin` above, should subclass `cloudquery.sdk.plugin.Plugin` and needs to implement three methods: `init`, `get_tables` and `sync`. The `init` method is called when the plugin is started, and is where you can do any initialization work. The `get_tables` method should return a list of tables that the plugin supports. The `sync` method is called when a table needs to be synced, and is where the SDK scheduler can be used to manage the syncing of all the supported tables. + +### Multi-threaded Scheduler + +The scheduler's main responsibilities are to manage concurrent execution of requests and the order in which tables are synced to avoid dependency issues. It also place limits on the number of concurrent requests and memory usage. + +To invoke the scheduler, the `sync` method of a plugin should pass a list of its tables and options to the scheduler. The scheduler will take care of the rest. Here is an example [from the Typeform plugin](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/typeform/plugin/plugin.py): + +```python +from typing import Generator + +from cloudquery.sdk import message +from cloudquery.sdk import plugin +from cloudquery.sdk.scheduler import TableResolver + +# ... + +class TypeformPlugin(plugin.Plugin): +# ... + def sync( + self, options: plugin.SyncOptions + ) -> Generator[message.SyncMessage, None, None]: + resolvers: list[TableResolver] = [] + for table in self.get_tables( + plugin.TableOptions( + tables=options.tables, + skip_tables=options.skip_tables, + skip_dependent_tables=options.skip_dependent_tables, + ) + ): + resolvers.append(table.resolver) + return self._scheduler.sync( + self._client, resolvers, options.deterministic_cq_id + ) +``` + +### Apache Arrow-based Type System with Custom Types + +Table columns are defined using the Apache Arrow type system, a powerful and flexible way to define data types. CloudQuery destinations support almost all Arrow types, and the Python SDK provides support for a few additional types, such as UUID, IP address and JSON. For example, here is the definition of the `typeform_forms` table from the Typeform plugin, that uses `string`, `timestamp` and `JSON` types: + +```python +import pyarrow as pa +from cloudquery.sdk.schema import Column +from cloudquery.sdk.schema import Table +from cloudquery.sdk.types import JSONType + +from plugin.tables.form_responses import FormResponses + +class Forms(Table): + def __init__(self) -> None: + super().__init__( + name="typeform_forms", + title="Typeform Forms", + columns=[ + Column("id", pa.string(), primary_key=True), + Column("created_at", pa.timestamp(unit="s")), + Column("last_updated_at", pa.timestamp(unit="s")), + Column("self", JSONType()), + Column("type", pa.string()), + Column("settings", JSONType()), + Column("theme", JSONType()), + Column("title", pa.string()), + Column("_links", JSONType()), + ], + relations=[FormResponses()], + ) +``` + +([Browse the full code on GitHub](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/typeform/plugin/tables/forms.py)) + +### OpenAPI Transformer + +The Python SDK introduces a transformer that can convert fields from an OpenAPI specification into CloudQuery-compatible table schemas. This can greatly reduce the manual work needed to develop plugins for APIs that have an OpenAPI spec. Check out the [Square plugin source code](https://github.com/cloudquery/cloudquery/blob/main/plugins/source/square/plugin/tables/bookings.py) for a great example of this in action. + +### Docker for Cross-Platform Distribution + +To support cross-platform packaging of Python plugins (and other languages in the future) in `v3.12.0` we introduced a new `docker` registry type to the CloudQuery CLI. Where Go-based plugins are downloaded as binaries from GitHub releases, Python plugins are downloaded as Docker images from the specified Docker registry. This allows CloudQuery to support multiple platforms, and also makes it easier to distribute plugins that have dependencies on external libraries. + +## Getting Started + +If you're keen to dive right in and develop a source plugin in Python, check out the [Python Plugin Development Guide](/docs/developers/creating-new-plugin/python-source) and sample plugins on GitHub: + - [Python SDK on PyPI](https://pypi.org/project/cloudquery-plugin-sdk/) + - [Square plugin](https://github.com/cloudquery/cloudquery/tree/main/plugins/source/square) + - [Typeform plugin](https://github.com/cloudquery/cloudquery/tree/main/plugins/source/typeform) + +We will also be adding more documentation and examples in the coming weeks, so stay tuned! + +## Future Work + +Work is already underway to add SDKs for more languages. We won't spoil the surprise here, but we're excited to share more details soon. Be sure to follow us on [Twitter](https://twitter.com/cloudqueryio) or subscribe to our newsletter below ๐Ÿ‘‡ to get the latest updates. + +The first release of the Python SDK only officially supports source plugins. Writing a destination plugin in Python is possible using the low-level gRPC APIs, but is not yet officially supported by the Python SDK. + +## Feedback + +We'd love to hear your feedback on the Python SDK. If you have any questions, comments, or suggestions, please feel free to reach out to us on [Discord](https://cloudquery.io/discord) or [GitHub](https://github.com/cloudquery/plugin-sdk-python). From 60fc8c46a1517abeb2053be1cf10eef0ad7bfbc1 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:15:10 +0300 Subject: [PATCH 81/87] chore(main): Release plugins-source-airtable v1.0.0 (#13164) :robot: I have created a release *beep* *boop* --- ## 1.0.0 (2023-08-17) ### Features * Initial release ([#13162](https://github.com/cloudquery/cloudquery/issues/13162)) ([558f596](https://github.com/cloudquery/cloudquery/commit/558f596a2c4868413b978a5c2a575e8654e617f9)) ### Bug Fixes * Rename spec option from `api_key` to `access_token` ([#13165](https://github.com/cloudquery/cloudquery/issues/13165)) ([5d9b33c](https://github.com/cloudquery/cloudquery/commit/5d9b33c6f706360f138788b350b52c9d8c205ae4)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 3 ++- plugins/source/airtable/CHANGELOG.md | 13 +++++++++++++ plugins/source/airtable/package-lock.json | 4 ++-- plugins/source/airtable/package.json | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 plugins/source/airtable/CHANGELOG.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 4348e17d5a95fc..5532135a2702f0 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -114,5 +114,6 @@ "plugins/source/jira": "1.0.2", "plugins/source/jira+FILLER": "0.0.0", "plugins/source/vault": "1.0.0", - "plugins/source/vault+FILLER": "0.0.0" + "plugins/source/vault+FILLER": "0.0.0", + "plugins/source/airtable": "1.0.0" } diff --git a/plugins/source/airtable/CHANGELOG.md b/plugins/source/airtable/CHANGELOG.md new file mode 100644 index 00000000000000..fdbf0ec6fb7f5d --- /dev/null +++ b/plugins/source/airtable/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + +## 1.0.0 (2023-08-17) + + +### Features + +* Initial release ([#13162](https://github.com/cloudquery/cloudquery/issues/13162)) ([558f596](https://github.com/cloudquery/cloudquery/commit/558f596a2c4868413b978a5c2a575e8654e617f9)) + + +### Bug Fixes + +* Rename spec option from `api_key` to `access_token` ([#13165](https://github.com/cloudquery/cloudquery/issues/13165)) ([5d9b33c](https://github.com/cloudquery/cloudquery/commit/5d9b33c6f706360f138788b350b52c9d8c205ae4)) diff --git a/plugins/source/airtable/package-lock.json b/plugins/source/airtable/package-lock.json index 4d4808fde38361..2dedcdffece307 100644 --- a/plugins/source/airtable/package-lock.json +++ b/plugins/source/airtable/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cloudquery/cq-source-airtable", - "version": "0.0.1", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cloudquery/cq-source-airtable", - "version": "0.0.1", + "version": "1.0.0", "license": "MPL-2.0", "dependencies": { "@cloudquery/plugin-sdk-javascript": "^0.0.4", diff --git a/plugins/source/airtable/package.json b/plugins/source/airtable/package.json index 200b77dad296a9..498505800f093b 100644 --- a/plugins/source/airtable/package.json +++ b/plugins/source/airtable/package.json @@ -1,6 +1,6 @@ { "name": "@cloudquery/cq-source-airtable", - "version": "0.0.1", + "version": "1.0.0", "description": "A CloudQuery source plugin to sync data from Airtable", "keywords": [ "nodejs", From cb4a46ed9bdd205f19f3d92636a40914aedc6b24 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:25:48 +0300 Subject: [PATCH 82/87] chore: Update plugin `source-airtable` version to v1.0.0 (#13166) Updates the `source-airtable` plugin latest version to v1.0.0 --- website/versions/source-airtable.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 website/versions/source-airtable.json diff --git a/website/versions/source-airtable.json b/website/versions/source-airtable.json new file mode 100644 index 00000000000000..e8f7a6d9c928c6 --- /dev/null +++ b/website/versions/source-airtable.json @@ -0,0 +1 @@ +{ "latest": "plugins-source-airtable-v1.0.0" } From cb38cc4a7138c6b3193be906adced8e0a308cff5 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 17 Aug 2023 15:30:50 +0300 Subject: [PATCH 83/87] chore: Update plugin `destination-mssql` version to v4.3.5 (#13103) Updates the `destination-mssql` plugin latest version to v4.3.5 --- website/versions/destination-mssql.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versions/destination-mssql.json b/website/versions/destination-mssql.json index 81b3139e1aad40..0243f493a954b9 100644 --- a/website/versions/destination-mssql.json +++ b/website/versions/destination-mssql.json @@ -1 +1 @@ -{ "latest": "plugins-destination-mssql-v4.3.4" } +{ "latest": "plugins-destination-mssql-v4.3.5" } From 9b53ff35927f7cc6723b4f89cd74c44c87eddde6 Mon Sep 17 00:00:00 2001 From: Erez Rokah Date: Thu, 17 Aug 2023 14:40:48 +0200 Subject: [PATCH 84/87] feat(website): Add developing a JavaScript plugin guide (#13168) #### Summary Documentation for the JS SDK If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- cli/go.mod | 2 +- cli/go.sum | 4 ++-- scaffold/cmd/templates/source/go.mod.tpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/go.mod b/cli/go.mod index 698087c373c5b0..849c300563a10e 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 - github.com/cloudquery/plugin-pb-go v1.9.2 + github.com/cloudquery/plugin-pb-go v1.9.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/getsentry/sentry-go v0.20.0 github.com/ghodss/yaml v1.0.0 diff --git a/cli/go.sum b/cli/go.sum index c40758b8a9c25f..b72533e95e5424 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -8,8 +8,8 @@ github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oM github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252 h1:3WLOXVaCTyR3R6kboC54UP8K+5s/VmSt4V/qkuONNwY= github.com/cloudquery/arrow/go/v13 v13.0.0-20230813001215-e9683e1ff252/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/cloudquery/plugin-pb-go v1.9.2 h1:jApELKSgtyj1dKQlD2hKPMTFs1GqOdSK8u+5rEluj4M= -github.com/cloudquery/plugin-pb-go v1.9.2/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= +github.com/cloudquery/plugin-pb-go v1.9.3 h1:A+TwhOHB68ZnjqrQYnVtWAzmUKEDnKleVG6QsoJ1gEQ= +github.com/cloudquery/plugin-pb-go v1.9.3/go.mod h1:f00zd6V5mWD+8Qw9U0eb4HD8RnAobwV9byBexE7Qa+0= github.com/cloudquery/plugin-sdk/v4 v4.5.0 h1:NbUXQJumFQbc6jh0I6eN2CfoF2m4KsQaxjI0mZIAff4= github.com/cloudquery/plugin-sdk/v4 v4.5.0/go.mod h1:lU/F5smij4Ud3sm2mqK//c/7loeYWywJdgq8lQrgOfY= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= diff --git a/scaffold/cmd/templates/source/go.mod.tpl b/scaffold/cmd/templates/source/go.mod.tpl index 6f48e8237a62bf..9faaa767af4635 100644 --- a/scaffold/cmd/templates/source/go.mod.tpl +++ b/scaffold/cmd/templates/source/go.mod.tpl @@ -4,7 +4,7 @@ go 1.20 require ( github.com/apache/arrow/go/v13 112f94971882 - github.com/cloudquery/plugin-pb-go v1.9.2 + github.com/cloudquery/plugin-pb-go v1.9.3 github.com/cloudquery/plugin-sdk/v4 v4.5.0 github.com/rs/zerolog v1.29.0 ) From f2d144e8fc505ea0aea902a1b2f01b985928eb54 Mon Sep 17 00:00:00 2001 From: CloudQuery Bot <102256036+cq-bot@users.noreply.github.com> Date: Thu, 17 Aug 2023 18:28:49 +0300 Subject: [PATCH 87/87] chore(main): Release cli v3.14.1 (#13170) :robot: I have created a release *beep* *boop* --- ## [3.14.1](https://github.com/cloudquery/cloudquery/compare/cli-v3.14.0...cli-v3.14.1) (2023-08-17) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.9.3 ([#13169](https://github.com/cloudquery/cloudquery/issues/13169)) ([f2afb88](https://github.com/cloudquery/cloudquery/commit/f2afb88201f2841bb7b20cf4c0c06f208e65764f)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .release-please-manifest.json | 2 +- cli/CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 5532135a2702f0..17acab0828b2e3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "cli": "3.14.0", + "cli": "3.14.1", "cli+FILLER": "0.0.0", "plugins/source/aws": "22.6.0", "plugins/source/aws+FILLER": "0.0.0", diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 853484f82d9235..166668a3e1bb00 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to CloudQuery will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.14.1](https://github.com/cloudquery/cloudquery/compare/cli-v3.14.0...cli-v3.14.1) (2023-08-17) + + +### Bug Fixes + +* **deps:** Update module github.com/cloudquery/plugin-pb-go to v1.9.3 ([#13169](https://github.com/cloudquery/cloudquery/issues/13169)) ([f2afb88](https://github.com/cloudquery/cloudquery/commit/f2afb88201f2841bb7b20cf4c0c06f208e65764f)) + ## [3.14.0](https://github.com/cloudquery/cloudquery/compare/cli-v3.13.1...cli-v3.14.0) (2023-08-15)