[Integrations] Reformatting integration queries (#1726)

* Reformatting integration queries to address the job type issue for MV creation Signed-off-by: Ryan Liang <[email protected]> * Adding reformatting for elb integration Signed-off-by: Ryan Liang <[email protected]> --------- Signed-off-by: Ryan Liang <[email protected]> (cherry picked from commit 5bff29d) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Apr 19, 2024 · d0ef91d · d0ef91d
1 parent ed0cebd
commit d0ef91d
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 19 deletions.
diff --git a/server/adaptors/integrations/__data__/repository/apache/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/apache/assets/create_mv-1.0.0.sql
@@ -14,4 +14,4 @@ WITH (
     checkpoint_location = '{s3_checkpoint_location}',
     watermark_delay = '1 Minute',
     extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_mv-1.0.0.sql
@@ -40,4 +40,4 @@ WITH (
   checkpoint_location = '{s3_checkpoint_location}',
   watermark_delay = '1 Minute',
   extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/...er/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_table-1.0.0.sql b/...er/adaptors/integrations/__data__/repository/aws_cloudfront/assets/create_table-1.0.0.sql
@@ -36,4 +36,4 @@ CREATE EXTERNAL TABLE IF NOT EXISTS {table_name} (
 USING csv
 LOCATION '{s3_bucket_location}'
 OPTIONS ( sep='\t' )
-TBLPROPERTIES ( 'skip.header.line.count'='2' );
+TBLPROPERTIES ( 'skip.header.line.count'='2' )
diff --git a/...integrations/__data__/repository/aws_cloudtrail/assets/create_table_cloud-trail-1.0.0.sql b/...integrations/__data__/repository/aws_cloudtrail/assets/create_table_cloud-trail-1.0.0.sql
@@ -62,4 +62,4 @@ LOCATION '{s3_bucket_location}'
 OPTIONS (
   compression='gzip',
   recursivefilelookup='true'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_mv-1.0.0.sql
@@ -57,4 +57,4 @@ WITH (
     checkpoint_location = '{s3_checkpoint_location}',
     watermark_delay = '1 Minute',
     extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_elb/assets/create_table-1.0.0.sql
@@ -35,4 +35,4 @@ OPTIONS (
   sep=' ',
   compression='gzip',
   recursiveFileLookup='true'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_mv-1.0.0.sql
@@ -33,4 +33,4 @@ WITH (
   checkpoint_location = '{s3_checkpoint_location}',
   watermark_delay = '1 Minute',
   extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_table-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_s3/assets/create_table-1.0.0.sql
@@ -29,4 +29,4 @@ USING csv
 OPTIONS (
   sep=' '
 )
-LOCATION '{s3_bucket_location}';
+LOCATION '{s3_bucket_location}'
diff --git a/.../adaptors/integrations/__data__/repository/aws_vpc_flow/assets/create_table_vpc-1.0.0.sql b/.../adaptors/integrations/__data__/repository/aws_vpc_flow/assets/create_table_vpc-1.0.0.sql
@@ -17,4 +17,4 @@ CREATE EXTERNAL TABLE IF NOT EXISTS {table_name} (
 LOCATION '{s3_bucket_location}'
 OPTIONS (
   sep=' '
-);
+)
diff --git a/...tegrations/__data__/repository/aws_vpc_flow/assets/vpc_agg_60min_connections_mv-1.0.0.sql b/...tegrations/__data__/repository/aws_vpc_flow/assets/vpc_agg_60min_connections_mv-1.0.0.sql
@@ -29,4 +29,3 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS {table_name}__agg_60_min_connections_mvie
 WITH (
   auto_refresh = false
 )
-
diff --git a/...r/adaptors/integrations/__data__/repository/aws_vpc_flow/assets/vpc_live_all_mv-1.0.0.sql b/...r/adaptors/integrations/__data__/repository/aws_vpc_flow/assets/vpc_live_all_mv-1.0.0.sql
@@ -59,4 +59,3 @@ WITH (
   watermark_delay = '1 Minute',
   extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
 )
-
diff --git a/.../adaptors/integrations/__data__/repository/aws_vpc_flow/assets/vpc_live_week_mv-1.0.0.sql b/.../adaptors/integrations/__data__/repository/aws_vpc_flow/assets/vpc_live_week_mv-1.0.0.sql
@@ -58,4 +58,3 @@ CREATE MATERIALIZED VIEW {table_name}__week_live_mview AS
 WITH (
   auto_refresh = false
 )
-
diff --git a/...ta__/repository/aws_vpc_flow/assets/vpc_window-agg_60min_dest_ip_cardinality_mv-1.0.0.sql b/...ta__/repository/aws_vpc_flow/assets/vpc_window-agg_60min_dest_ip_cardinality_mv-1.0.0.sql
@@ -33,4 +33,3 @@ ORDER BY
 WITH (
   auto_refresh = false
 )
-
diff --git a/...ta__/repository/aws_vpc_flow/assets/vpc_window-agg_60min_dest_ip_total-bytes_mv-1.0.0.sql b/...ta__/repository/aws_vpc_flow/assets/vpc_window-agg_60min_dest_ip_total-bytes_mv-1.0.0.sql
@@ -33,4 +33,3 @@ WITH hourly_buckets AS (
 WITH (
   auto_refresh = false
 )
-
diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_mv-1.0.0.sql
@@ -26,4 +26,4 @@ WITH (
   checkpoint_location = '{s3_checkpoint_location}',
   watermark_delay = '1 Minute',
   extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_table-1.0.0.sql b/server/adaptors/integrations/__data__/repository/aws_waf/assets/create_table-1.0.0.sql
@@ -125,4 +125,4 @@ CREATE EXTERNAL TABLE {table_name} (
   `ja3Fingerprint` string
 )
 USING json
-LOCATION '{s3_bucket_location}'
+LOCATION '{s3_bucket_location}'
diff --git a/server/adaptors/integrations/__data__/repository/haproxy/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/haproxy/assets/create_mv-1.0.0.sql
@@ -148,4 +148,4 @@ WITH (
     checkpoint_location = '{s3_checkpoint_location}',
     watermark_delay = '1 Minute',
     extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/haproxy/assets/create_table-1.0.0.sql b/server/adaptors/integrations/__data__/repository/haproxy/assets/create_table-1.0.0.sql
@@ -4,4 +4,4 @@ CREATE EXTERNAL TABLE {table_name} (
 LOCATION '{s3_bucket_location}'
 OPTIONS (
   sep='\0x1E'
-);
+)
diff --git a/server/adaptors/integrations/__data__/repository/nginx/assets/create_mv-1.0.0.sql b/server/adaptors/integrations/__data__/repository/nginx/assets/create_mv-1.0.0.sql
@@ -14,4 +14,4 @@ WITH (
     checkpoint_location = '{s3_checkpoint_location}',
     watermark_delay = '1 Minute',
     extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
-);
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ CREATE EXTERNAL TABLE IF NOT EXISTS {table_name} ( @@
     LOCATION '{s3_bucket_location}'
     OPTIONS (
       sep=' '
-    );
+    )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,3 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS {table_name}__agg_60_min_connections_mvie
		WITH (
		auto_refresh = false
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,3 @@ WITH (
		watermark_delay = '1 Minute',
		extra_options = '{ "{table_name}": { "maxFilesPerTrigger": "10" }}'
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,4 +58,3 @@ CREATE MATERIALIZED VIEW {table_name}__week_live_mview AS
		WITH (
		auto_refresh = false
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,3 @@ ORDER BY
		WITH (
		auto_refresh = false
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,3 @@ WITH hourly_buckets AS (
		WITH (
		auto_refresh = false
		)