Skip to content

Upload META.d folder#9002

Merged
SarahFrench merged 2 commits into
GoogleCloudPlatform:mainfrom
sheneska:heimdall-project
Sep 21, 2023
Merged

Upload META.d folder#9002
SarahFrench merged 2 commits into
GoogleCloudPlatform:mainfrom
sheneska:heimdall-project

Conversation

@sheneska

@sheneska sheneska commented Sep 19, 2023

Copy link
Copy Markdown
Contributor

This PR will add the META.d folder so the repo can be documented on Heimdall.

Release Note Template for Downstream PRs (will be copied)


@google-cla

This comment was marked as resolved.

@modular-magician

Copy link
Copy Markdown
Collaborator

Hello! I am a robot. It looks like you are a: Community Contributor Googler Core Contributor. Tests will require approval to run.

@trodge, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

@modular-magician modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Sep 19, 2023
@SarahFrench SarahFrench requested review from SarahFrench and removed request for trodge September 19, 2023 19:12
@modular-magician modular-magician removed the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Sep 19, 2023
@modular-magician

Copy link
Copy Markdown
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.

@SarahFrench

SarahFrench commented Sep 19, 2023

Copy link
Copy Markdown
Contributor

@sheneska , could you please update the mmv1/provider/terraform/common~copy.yaml file to insert this block of code:

<%
  Dir["third_party/terraform/META.d/*.yaml"].each do |file_path|
    fname = file_path.delete_prefix("third_party/terraform/")
-%>
'<%= fname -%>': '<%= file_path -%>'
<% end -%>

directly above this section at the end of the file:

'.teamcity/.gitignore': 'third_party/terraform/.teamcity/.gitignore'
'.teamcity/Makefile': 'third_party/terraform/.teamcity/Makefile'
'version/version.go': 'third_party/terraform/version/version.go'
'go.sum': 'third_party/terraform/go.sum'


That file instructs the code generator how to copy static files into the downstream google and google-beta repos. The new block makes the generator find all YAML files in the META.d folder and copies them into a META.d folder in the provider repos.

Edit: without this change, your PR results in no changes to the downstream providers as the files aren't being copied over yet

@modular-magician modular-magician added awaiting-approval Pull requests that need reviewer's approval to run presubmit tests and removed awaiting-approval Pull requests that need reviewer's approval to run presubmit tests labels Sep 19, 2023
@modular-magician

Copy link
Copy Markdown
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 ( 2 files changed, 19 insertions(+))
Terraform Beta: Diff ( 2 files changed, 19 insertions(+))

@SarahFrench

Copy link
Copy Markdown
Contributor

@sheneska I was about to merge but then figured I'd ask - should the files be different for the google and google-beta providers? If you click the links in this report you can see how this PR changes those providers by adding files with the same content.

If the files being the same in the google and google-beta provider repos is OK, we can get this PR merged 🚀

@SarahFrench

Copy link
Copy Markdown
Contributor

After conversations on Slack we've agreed that having the same info passed into the TPG/TPGB repos is ok. Merging now.

@SarahFrench SarahFrench merged commit 8eabaaf into GoogleCloudPlatform:main Sep 21, 2023
nevzheng pushed a commit to nevzheng/magic-modules that referenced this pull request Sep 22, 2023
* Upload META.d folder

* Update common~copy.yaml
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.

3 participants