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

Upstream resource_logging_project_sink exclusions #4027

Merged

Conversation

slevenick
Copy link
Contributor

@slevenick slevenick commented Sep 28, 2020

Upstreams: hashicorp/terraform-provider-google#7335

Added as defined in https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks#LogExclusion
Log entries that match any of the exclusion filters will not be exported.
If a log entry is matched by both filter and one of exclusion_filters it will not be exported.

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

logging: Added support for exclusions options for `google_logging_project_sink `

@google-cla
Copy link

google-cla bot commented Sep 28, 2020

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label Sep 28, 2020
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 134 insertions(+))
Terraform Beta: Diff ( 2 files changed, 134 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=149187"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceDnsManagedZone_basic|TestAccProviderMeta_setModuleName|TestAccComputeSnapshot_encryptionCMEK|TestAccContainerCluster_withSandboxConfig|TestAccContainerNodePool_withSandboxConfig|TestAccLoggingProjectSink_loggingbucket|TestAccMonitoringDashboard_basic|TestAccMonitoringDashboard_gridLayout|TestAccMonitoringDashboard_rowLayout|TestAccMonitoringDashboard_update You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=149270"

@pmoncadaisla
Copy link
Contributor

@googlebot I consent.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 134 insertions(+))
Terraform Beta: Diff ( 2 files changed, 134 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=149378"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDataSourceDnsManagedZone_basic|TestAccProviderMeta_setModuleName|TestAccComputeSnapshot_encryptionCMEK|TestAccContainerCluster_withSandboxConfig|TestAccContainerNodePool_withSandboxConfig|TestAccLoggingProjectSink_loggingbucket|TestAccMonitoringDashboard_gridLayout|TestAccMonitoringDashboard_basic|TestAccMonitoringDashboard_rowLayout|TestAccMonitoringDashboard_update You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=149383"

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 125 insertions(+))
Terraform Beta: Diff ( 2 files changed, 125 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=150034"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccProviderMeta_setModuleName|TestAccComputeSnapshot_encryptionCMEK|TestAccContainerCluster_withSandboxConfig|TestAccContainerNodePool_withSandboxConfig|TestAccLoggingProjectSink_loggingbucket|TestAccMonitoringDashboard_gridLayout|TestAccMonitoringDashboard_basic|TestAccMonitoringDashboard_rowLayout|TestAccMonitoringDashboard_update You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=150040"

@slevenick slevenick changed the title Add exclusions option for resource_logging_project_sink Upstream resource_logging_project_sink exclusions Oct 2, 2020
@slevenick slevenick requested review from c2thorn and removed request for c2thorn October 2, 2020 20:58
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 159 insertions(+))
Terraform Beta: Diff ( 3 files changed, 159 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=150802"

Added as definedd in https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks#LogExclusion
Log entries that match any of the exclusion filters will not be exported.
If a log entry is matched by both filter and one of exclusion_filters it will not be exported.
This will avoid unnecessary conversions and it is also defined
as a boolean in the API client.
This test resource does not  createa a logging bucket, it just
modifies its config, therefore it is not suitable for the test.

For this test, the sink with exclusions will be tested directly with
the _Default log bucket as we want to test the exclusions, which is enough.
@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 3 files changed, 159 insertions(+))
Terraform Beta: Diff ( 3 files changed, 159 insertions(+))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests based on this PR's diffs. See the results here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=150804"

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccProviderMeta_setModuleName|TestAccComputeSnapshot_encryptionCMEK|TestAccMonitoringDashboard_basic|TestAccMonitoringDashboard_gridLayout|TestAccMonitoringDashboard_rowLayout|TestAccMonitoringDashboard_update You can view the result here: "https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=150808"

@slevenick slevenick requested a review from c2thorn October 7, 2020 21:58
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.

4 participants