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

Applying terraform format to all files #18

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

ilakhtenkov
Copy link
Contributor

No description provided.

@google-cla
Copy link

google-cla bot commented Nov 16, 2022

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@ilakhtenkov ilakhtenkov force-pushed the feature/fix-formating branch from 11ca33b to cf5b234 Compare November 16, 2022 23:53
@ilakhtenkov
Copy link
Contributor Author

ilakhtenkov commented Nov 18, 2022

Hi @rarsan, @npredey.
I want to contribute feature for KMS encrypted tokens and token from Secretes.
The branch is huge.
In order to simplify PR review process I spitted it in to 3 PRs:

  1. Fix terraform format Applying terraform format to all files #18 (this PR)
  2. Add terraform-docs support Add terraform docs generation #19
  3. Actual KMS and Secrets feature Add kms and secret token types #20

Is PR is number 1 from the list. Could you please review and merge.

@rarsan
Copy link
Member

rarsan commented Nov 20, 2022

Thank you @Lakhtenkov-iv for contributing this. I see you already signed the CLA.

I appreciate you breaking this down into 3 PRs. I will review all by Mon or Tue. Thanks.

@rarsan rarsan self-requested a review November 20, 2022 00:30
@rarsan rarsan self-assigned this Nov 20, 2022
Copy link
Member

@rarsan rarsan left a comment

Choose a reason for hiding this comment

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

Thanks for your patience. Looks good! Some minor comments below. Please see note re 2 required variables that were accidentally removed.

With respect to the workflow yaml file, I appreciate you adding that. Do we need to add any usage instructions?

@@ -44,29 +35,27 @@ locals {
dataflow_temporary_gcs_bucket_path = "tmp/"

dataflow_splunk_template_gcs_path = "gs://dataflow-templates/${var.dataflow_template_version}/Cloud_PubSub_to_Splunk"
dataflow_pubsub_template_gcs_path = "gs://dataflow-templates/${var.dataflow_template_version}/Cloud_PubSub_to_Cloud_PubSub"
Copy link
Member

Choose a reason for hiding this comment

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

This variable is used in the replay pipeline included in replay.tf. The replay pipeline is only deployed to recover undelivered messages as described in this solution guide. Therefore it's commented out by default in the replay.tf file. There are probably better ways to do this, but for now we probably add lint warning ignore around this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry I didn't get the point that I need to uncomment the code to deploy. I have brought back variable.

project_log_sink_name = "${var.dataflow_job_name}-project-log-sink"
organization_log_sink_name = "${var.dataflow_job_name}-organization-log-sink"
Copy link
Member

Choose a reason for hiding this comment

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

Same with this variable which is used in a commented out resource organization_log_sink. Let's add tflint-ignore for now? We can add a terraform variable in subsequent PR to conditionally control creation of the org log sink (in addition to new organization_id TF variable).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed as well.

@@ -0,0 +1,13 @@
terraform {
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for adding the providers and versions files.
I don't think I've personally tested these older provider versions though.
Has this been tested with these versions? For example, random version below is about 5 yrs old.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, you are right we need to bump up all the 3: terraform, google and random provider. I will test. Please don't merge

Copy link
Contributor Author

@ilakhtenkov ilakhtenkov Nov 24, 2022

Choose a reason for hiding this comment

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

Now it is good, I've tested with minimal versions that are defined.

@ilakhtenkov ilakhtenkov force-pushed the feature/fix-formating branch from cf5b234 to 78d18fd Compare November 23, 2022 23:55
@ilakhtenkov
Copy link
Contributor Author

Hi @rarsan. Any feedback on this PR?

@rarsan rarsan merged commit 6215a64 into GoogleCloudPlatform:main Nov 30, 2022
@rarsan
Copy link
Member

rarsan commented Nov 30, 2022

Thanks for the fixes! PR merged.

@ilakhtenkov ilakhtenkov deleted the feature/fix-formating branch December 2, 2022 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants