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 eventarc trigger missing field event_data_content_type #8235

Merged

Conversation

RileyHYZ
Copy link
Contributor

@RileyHYZ RileyHYZ commented Jun 29, 2023

This PR upgrades dcl version to v.1.48.0 and adds a field event_data_content_type in eventarc trigger.

fixes hashicorp/terraform-provider-google#14597

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).
  • 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).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

eventarc: added field `event_data_content_type` to `google_eventarc_trigger`

@modular-magician
Copy link
Collaborator

Hello! I am a robot who works on Magic Modules PRs.

I've detected that you're a community contributor. @slevenick, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

  • Ensuring it's backwards compatible, covers common error cases, etc.
  • Summarizing the change into a user-facing changelog note.
  • Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.


@modular-magician modular-magician added the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Jun 29, 2023
service = google_cloud_run_service.default.name
region = "europe-west1"
}
}s
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo here may cause test failures

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

@modular-magician modular-magician removed the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Jun 29, 2023
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 13 files changed, 210 insertions(+), 66 deletions(-))
Terraform Beta: Diff ( 11 files changed, 171 insertions(+), 29 deletions(-))
TF Conversion: Diff ( 2 files changed, 6 insertions(+), 6 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_clouddeploy_delivery_pipeline (10 total tests)
Untested fields: serial_pipeline.stages.deploy_parameters.match_target_labels, serial_pipeline.stages.deploy_parameters.values, serial_pipeline.stages.strategy.canary.runtime_config.kubernetes.service_networking.disable_pod_overprovisioning

Please add acceptance tests which include these fields.

@modular-magician modular-magician added the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Jun 29, 2023
@slevenick
Copy link
Contributor

Can you try pushing a new commit? This got caught in the GitHub downtime

@slevenick
Copy link
Contributor

/gcbrun

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2834
Passed tests 2526
Skipped tests: 295
Affected tests: 13

Action taken

Found 13 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccFilestoreSnapshot_filestoreSnapshotFullExample|TestAccFilestoreSnapshot_filestoreSnapshotBasicExample|TestAccFilestoreInstance_update|TestAccFilestoreInstance_filestoreInstanceFullExample|TestAccFilestoreInstance_filestoreInstanceBasicExample|TestAccFilestoreBackup_update|TestAccFilestoreBackup_filestoreBackupBasicExample|TestAccComputeFirewallPolicyRule_multipleRules|TestAccClouddeployDeliveryPipeline_VerifyDeliveryPipeline|TestAccClouddeployDeliveryPipeline_CanaryDeliveryPipeline|TestAccClouddeployDeliveryPipeline_DeliveryPipeline|TestAccClouddeployDeliveryPipeline_CanaryrunDeliveryPipeline|TestAccClouddeployDeliveryPipeline_CanaryServiceNetworkingDeliveryPipeline

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

Several tests got terminated during RECORDING mode.
View the build log or the debug log for each test

@slevenick
Copy link
Contributor

/gcbrun

@modular-magician modular-magician removed the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Jul 10, 2023
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR hasn't generated any diffs, but I'll let you know if a future commit does.

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2847
Passed tests 2548
Skipped tests: 295
Affected tests: 4

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccComputeTargetHttpsProxy_targetHttpsProxyHttpKeepAliveTimeoutExample|TestAccContainerAwsNodePool_BetaBasicHandWritten|TestAccComputeTargetHttpProxy_targetHttpProxyHttpKeepAliveTimeoutExample|TestAccComputeFirewallPolicyRule_multipleRules

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccComputeTargetHttpsProxy_targetHttpsProxyHttpKeepAliveTimeoutExample[Debug log]
TestAccComputeTargetHttpProxy_targetHttpProxyHttpKeepAliveTimeoutExample[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]
TestAccComputeFirewallPolicyRule_multipleRules[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@adsko
Copy link

adsko commented Jul 31, 2023

@slevenick @RileyHYZ Hey! Nice job with this one, but is there any update? Would be nice to have it.

@slevenick
Copy link
Contributor

The DCL was upgraded to 1.44.0 but this field doesn't seem to be present. I'm not sure why, as it exists in the YAML file for that resource in this release: https://github.com/GoogleCloudPlatform/declarative-resource-client-library/blame/main/services/google/eventarc/trigger.yaml

@slevenick
Copy link
Contributor

Ah I see what happened. It's present in GA but not beta, so things are a little weird. I'll ping someone to get this resolved

@RileyHYZ
Copy link
Contributor Author

The change is intended for GA but not beta and the issue should have been resolved with dcl version>1.42.0. I'll resolve the conflict and commit again.

@modular-magician modular-magician added the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Jul 31, 2023
@adsko
Copy link

adsko commented Aug 4, 2023

@slevenick

@RileyHYZ
Copy link
Contributor Author

RileyHYZ commented Aug 4, 2023

Change has been included for both GA and Beta

@modular-magician modular-magician removed the awaiting-approval Pull requests that needs reviewer's approval to run presubmit tests label Aug 4, 2023
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 7 files changed, 102 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 9 files changed, 457 insertions(+), 60 deletions(-))
TF Conversion: Diff ( 2 files changed, 6 insertions(+), 6 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_clouddeploy_delivery_pipeline (10 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_clouddeploy_delivery_pipeline" "primary" {
  serial_pipeline {
    stages {
      strategy {
        canary {
          canary_deployment {
            postdeploy {
              actions = # value needed
            }
            predeploy {
              actions = # value needed
            }
          }
          custom_canary_deployment {
            phase_configs {
              postdeploy {
                actions = # value needed
              }
              predeploy {
                actions = # value needed
              }
            }
          }
          runtime_config {
            kubernetes {
              gateway_service_mesh {
                route_update_wait_time = # value needed
              }
            }
          }
        }
        standard {
          postdeploy {
            actions = # value needed
          }
          predeploy {
            actions = # value needed
          }
        }
      }
    }
  }
}

Resource: google_dataplex_asset (7 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_dataplex_asset" "primary" {
  resource_spec {
    read_access_mode = # value needed
  }
}

Resource: google_eventarc_trigger (4 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_eventarc_trigger" "primary" {
  event_data_content_type = # value needed
}

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 7 files changed, 102 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 9 files changed, 457 insertions(+), 60 deletions(-))
TF Conversion: Diff ( 2 files changed, 6 insertions(+), 6 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_clouddeploy_delivery_pipeline (10 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_clouddeploy_delivery_pipeline" "primary" {
  serial_pipeline {
    stages {
      strategy {
        canary {
          canary_deployment {
            postdeploy {
              actions = # value needed
            }
            predeploy {
              actions = # value needed
            }
          }
          custom_canary_deployment {
            phase_configs {
              postdeploy {
                actions = # value needed
              }
              predeploy {
                actions = # value needed
              }
            }
          }
          runtime_config {
            kubernetes {
              gateway_service_mesh {
                route_update_wait_time = # value needed
              }
            }
          }
        }
        standard {
          postdeploy {
            actions = # value needed
          }
          predeploy {
            actions = # value needed
          }
        }
      }
    }
  }
}

Resource: google_dataplex_asset (7 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_dataplex_asset" "primary" {
  resource_spec {
    read_access_mode = # value needed
  }
}

Resource: google_eventarc_trigger (4 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_eventarc_trigger" "primary" {
  event_data_content_type = # value needed
}

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2930
Passed tests 2624
Skipped tests: 302
Affected tests: 4

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccDataplexAsset_BasicAssetHandWritten|TestAccDataplexAssetIamBindingGenerated|TestAccDataplexAssetIamMemberGenerated|TestAccDataplexAssetIamPolicyGenerated

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccDataplexAsset_BasicAssetHandWritten[Error message] [Debug log]
TestAccDataplexAssetIamBindingGenerated[Error message] [Debug log]
TestAccDataplexAssetIamMemberGenerated[Error message] [Debug log]
TestAccDataplexAssetIamPolicyGenerated[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Looks like updating the DCL has introduced an issue in dataplex asset. Several tests are failing due to large diffs. I'll need to reach out to some people to see what is going on there

@NickElliot
Copy link
Contributor

Update to resolve the issue on DCL's end is in review. Apologies for the complications!

@NickElliot
Copy link
Contributor

The DCL issue should be resolved now with the new release.

@slevenick
Copy link
Contributor

@RileyHYZ you can upgrade the DCL to the new version and the tests should pass now

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 7 files changed, 102 insertions(+), 13 deletions(-))
Terraform Beta: Diff ( 9 files changed, 457 insertions(+), 60 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_clouddeploy_delivery_pipeline (10 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_clouddeploy_delivery_pipeline" "primary" {
  serial_pipeline {
    stages {
      strategy {
        canary {
          canary_deployment {
            postdeploy {
              actions = # value needed
            }
            predeploy {
              actions = # value needed
            }
          }
          custom_canary_deployment {
            phase_configs {
              postdeploy {
                actions = # value needed
              }
              predeploy {
                actions = # value needed
              }
            }
          }
          runtime_config {
            kubernetes {
              gateway_service_mesh {
                route_update_wait_time = # value needed
              }
            }
          }
        }
        standard {
          postdeploy {
            actions = # value needed
          }
          predeploy {
            actions = # value needed
          }
        }
      }
    }
  }
}

Resource: google_dataplex_asset (7 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_dataplex_asset" "primary" {
  resource_spec {
    read_access_mode = # value needed
  }
}

Resource: google_eventarc_trigger (4 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_eventarc_trigger" "primary" {
  event_data_content_type = # value needed
}

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2936
Passed tests 2630
Skipped tests: 302
Affected tests: 4

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccDataplexAsset_BasicAssetHandWritten|TestAccDataplexAssetIamBindingGenerated|TestAccDataplexAssetIamPolicyGenerated|TestAccDataplexAssetIamMemberGenerated

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccDataplexAsset_BasicAssetHandWritten[Error message] [Debug log]
TestAccDataplexAssetIamBindingGenerated[Error message] [Debug log]
TestAccDataplexAssetIamPolicyGenerated[Error message] [Debug log]
TestAccDataplexAssetIamMemberGenerated[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@@ -4,7 +4,7 @@ go 1.19

require (
cloud.google.com/go/bigtable v1.19.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.44.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.47.0
Copy link
Contributor

Choose a reason for hiding this comment

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

You'll need to update this to 1.48.0

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 see the upgraded version earlier. Just updated it in the new commit. Thanks!

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 7 files changed, 102 insertions(+), 14 deletions(-))
Terraform Beta: Diff ( 9 files changed, 457 insertions(+), 61 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_clouddeploy_delivery_pipeline (10 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_clouddeploy_delivery_pipeline" "primary" {
  serial_pipeline {
    stages {
      strategy {
        canary {
          canary_deployment {
            postdeploy {
              actions = # value needed
            }
            predeploy {
              actions = # value needed
            }
          }
          custom_canary_deployment {
            phase_configs {
              postdeploy {
                actions = # value needed
              }
              predeploy {
                actions = # value needed
              }
            }
          }
          runtime_config {
            kubernetes {
              gateway_service_mesh {
                route_update_wait_time = # value needed
              }
            }
          }
        }
        standard {
          postdeploy {
            actions = # value needed
          }
          predeploy {
            actions = # value needed
          }
        }
      }
    }
  }
}

Resource: google_dataplex_asset (7 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_dataplex_asset" "primary" {
  resource_spec {
    read_access_mode = # value needed
  }
}

Resource: google_eventarc_trigger (4 total tests)
Please add an acceptance test which includes these fields. The test should include the following:

resource "google_eventarc_trigger" "primary" {
  event_data_content_type = # value needed
}

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2939
Passed tests 2637
Skipped tests: 302
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

Copy link
Contributor

@slevenick slevenick left a comment

Choose a reason for hiding this comment

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

Thanks!

@slevenick slevenick merged commit 3f89d52 into GoogleCloudPlatform:main Aug 8, 2023
14 checks passed
jeperetz pushed a commit to jeperetz/magic-modules that referenced this pull request Aug 10, 2023
…udPlatform#8235)

* upgrade dcl version to v1.43.0

* add overrides samples for trigger event_data_content_type field

* Fix typo

* Upgrade dcl version to v1.47.0

* Upgrade dcl version to v1.48.0 to fix issues in previous version.

---------

Co-authored-by: Riley <rileyzhou@google.com>
ron-gal pushed a commit to ron-gal/magic-modules that referenced this pull request Aug 17, 2023
…udPlatform#8235)

* upgrade dcl version to v1.43.0

* add overrides samples for trigger event_data_content_type field

* Fix typo

* Upgrade dcl version to v1.47.0

* Upgrade dcl version to v1.48.0 to fix issues in previous version.

---------

Co-authored-by: Riley <rileyzhou@google.com>
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.

EventArc Trigger Missing Required property event_data_content_type
5 participants