Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add groupName attribute to v1 template where it's needed (part 3) #1542

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

akashorabek
Copy link
Contributor

No description provided.

@akashorabek akashorabek marked this pull request as ready for review May 10, 2024 05:20
@akashorabek akashorabek requested a review from a team as a code owner May 10, 2024 05:20
@akashorabek akashorabek requested review from shreyakhajanchi and aksharauke and removed request for a team May 10, 2024 05:20
@an2x an2x self-requested a review May 10, 2024 17:42
@@ -132,6 +137,7 @@ public interface Options extends PipelineOptions {

@TemplateParameter.Text(
order = 6,
groupName = "Target",
description = "ID column",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this template, I think it makes sense to keep only outputDirectory and finalenamePrefix in the "Target" group. "Target" usually means where to write the output, e.g. connection details, bucket name, file name, etc. Everything else in this template either belongs to both "source" and "target" (e.g. idColumn) or describes the data format being processed. I'd only the current 3 params under "Source" and outputDirectory and finalenamePrefix under "Target" , and leave all other params ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -106,6 +109,7 @@ public interface ExportPipelineOptions extends PipelineOptions {

@TemplateParameter.GcsWriteFolder(
order = 4,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave ungrouped. This is not the "target" (where the result is going to be stored), this is a separate directory for temp files. It might be completely different from the target bucket/directory.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -277,6 +291,7 @@ public interface Options extends PipelineOptions {

@TemplateParameter.GcsWriteFolder(
order = 16,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. This is not the target but an extra output. Leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -182,6 +184,7 @@ public interface Options extends PipelineOptions {

@TemplateParameter.GcsWriteFile(
order = 3,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. Not a target, leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -153,6 +156,7 @@ public interface Options extends DataflowPipelineOptions, CsvPipelineOptions {

@TemplateParameter.GcsWriteFolder(
order = 4,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. Not a target, leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -326,6 +329,7 @@ public interface TokenizePipelineOptions extends DataflowPipelineOptions {

@TemplateParameter.Integer(
order = 4,
groupName = "Source",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. This is about the DLP API call made in the middle. Probably makes sense to combine inspectTemplateName and batchSize under a separate 3rd group called "DLP Configuration".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -349,6 +354,7 @@ public interface TokenizePipelineOptions extends DataflowPipelineOptions {

@TemplateParameter.ProjectId(
order = 6,
groupName = "Source",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same. Move to "DLP Configuration" group.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -158,6 +163,7 @@ public interface Options

@TemplateParameter.GcsWriteFolder(
order = 7,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a target, leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -128,6 +131,7 @@ public interface Options

@TemplateParameter.GcsWriteFolder(
order = 4,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a target. Leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -385,6 +385,7 @@ public String apply(String input) {
public interface TextToBigQueryStreamingOptions extends TextIOToBigQuery.Options {
@TemplateParameter.BigQueryTable(
order = 1,
groupName = "Target",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a target. Leave ungrouped.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link

codecov bot commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 39.89%. Comparing base (b910d17) to head (3e2e690).
Report is 269 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1542      +/-   ##
============================================
- Coverage     40.27%   39.89%   -0.38%     
+ Complexity     2817     2782      -35     
============================================
  Files           740      750      +10     
  Lines         42899    42568     -331     
  Branches       4604     4555      -49     
============================================
- Hits          17276    16981     -295     
+ Misses        24133    24120      -13     
+ Partials       1490     1467      -23     
Components Coverage Δ
spanner-templates 56.72% <ø> (-0.12%) ⬇️
spanner-import-export 65.59% <ø> (-0.03%) ⬇️
spanner-live-forward-migration 61.23% <ø> (-1.94%) ⬇️
spanner-live-reverse-replication 42.53% <ø> (-0.43%) ⬇️
spanner-bulk-migration 72.00% <ø> (+2.02%) ⬆️
Files Coverage Δ
...google/cloud/teleport/bigtable/AvroToBigtable.java 62.26% <ø> (ø)
...google/cloud/teleport/bigtable/BigtableToAvro.java 36.36% <ø> (ø)
...google/cloud/teleport/bigtable/BigtableToJson.java 63.33% <ø> (ø)
...gle/cloud/teleport/bigtable/BigtableToParquet.java 41.86% <ø> (ø)
.../teleport/bigtable/BigtableToVectorEmbeddings.java 78.33% <ø> (ø)
...e/cloud/teleport/bigtable/CassandraToBigtable.java 0.00% <ø> (ø)
...gle/cloud/teleport/bigtable/ParquetToBigtable.java 57.14% <ø> (ø)
.../google/cloud/teleport/spanner/ExportPipeline.java 0.00% <ø> (ø)
.../google/cloud/teleport/spanner/ImportPipeline.java 0.00% <ø> (ø)
...gle/cloud/teleport/spanner/TextImportPipeline.java 0.00% <ø> (ø)
... and 17 more

... and 85 files with indirect coverage changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants