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

Apply reformatText to the backup .Description text #1902

Merged
merged 2 commits into from
Apr 25, 2024

Conversation

iwahbe
Copy link
Member

@iwahbe iwahbe commented Apr 25, 2024

This fixes the root cause for pulumi/pulumi-gcp#1950.

@iwahbe iwahbe self-assigned this Apr 25, 2024
Comment on lines +2198 to +2199
// TODO[pulumi/pulumi-java#1271]: This should be fixed in pulumi/pulumi-java
text = illegalJavaPattern.ReplaceAllString(text, "")
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the java specific change here.

Comment on lines +1257 to +1261
rawdoc, elided := reformatText(infoContext{
language: g.language,
pkg: g.pkg,
info: g.info,
}, propschema.Description(), nil)
Copy link
Member Author

Choose a reason for hiding this comment

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

This puts description based docs through our general docs cleaning pipeline, including the java change.

@iwahbe iwahbe force-pushed the iwahbe/reformat-.Description-based-text branch from 7629901 to b03f4da Compare April 25, 2024 00:46
iwahbe added a commit to pulumi/ci-mgmt that referenced this pull request Apr 25, 2024
Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.26%. Comparing base (9124a58) to head (b03f4da).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1902   +/-   ##
=======================================
  Coverage   60.25%   60.26%           
=======================================
  Files         328      328           
  Lines       44322    44331    +9     
=======================================
+ Hits        26706    26715    +9     
  Misses      16120    16120           
  Partials     1496     1496           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -67,7 +67,7 @@
"additionalProperties": {
"$ref": "pulumi.json#/Any"
},
"description": "Arbitrary map of values that, when changed, will trigger recreation of resource. See [the main provider\ndocumentation](../index.html) for more information.\n",
"description": "Arbitrary map of values that, when changed, will trigger recreation of resource. See the main provider documentation for\nmore information.\n",
Copy link
Contributor

Choose a reason for hiding this comment

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

This change is odd - is the link removal expected?
The newline in the middle certainly doesn't look intended.

Copy link
Member Author

Choose a reason for hiding this comment

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

I believe the change is correct.

  • We the remove relative links because the registry doesn't have the same structure as upstream's docs. This is intentional.
  • The newline is present in the upstream doc. reformatText moved it, but it doesn't look like a negative change.

@@ -2291,8 +2291,7 @@
"type": "string"
},
"forceDestroy": {
"type": "boolean",
"description": "Delete user even if it has non-Terraform-managed IAM access keys, login profile or MFA devices\n"
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this fix pulumi/pulumi-gcp#1945?

Copy link
Member Author

Choose a reason for hiding this comment

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

It does not fix it, but it reduces the number of incidents.

@iwahbe iwahbe merged commit 3770ed5 into master Apr 25, 2024
11 checks passed
@iwahbe iwahbe deleted the iwahbe/reformat-.Description-based-text branch April 25, 2024 15:34
iwahbe added a commit to pulumi/ci-mgmt that referenced this pull request Apr 25, 2024
Ensure that javadoc runs cleanly
Fixes pulumi/pulumi-gcp#1950

Needs to merge **after**
pulumi/pulumi-terraform-bridge#1902.
iwahbe added a commit to pulumi/pulumi-gcp that referenced this pull request Apr 26, 2024
The commit has merged into master on the bridge, so will be contained in the next bridge
release.
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.

None yet

2 participants