Skip to content

Commit

Permalink
Merge #11492
Browse files Browse the repository at this point in the history
11492: codegen/go: Remove superfluous newline in doc.go r=Frassle a=Frassle

# Description

This change fixes the package documentation comment generation that was broken since #10317.

That is, Go requires package documentation comment to be strictly before the package statement without newlines in-between.

**Good**
```
// Package good has documentation comment.
package bad
```

**Bad**
```
// Package bad does no have a documentation comment.

package bad
```

## Checklist

<!--- Please provide details if the checkbox below is to be left unchecked. -->
- [ ] I have added tests that prove my fix is effective or that my feature works
<!--- 
User-facing changes require a CHANGELOG entry.
-->
- [x] I have run `make changelog` and committed the `changelog/pending/<file>` documenting my change
<!--
If the change(s) in this PR is a modification of an existing call to the Pulumi Service,
then the service should honor older versions of the CLI where this change would not exist.
You must then bump the API version in /pkg/backend/httpstate/client/api.go, as well as add
it to the service.
-->
- [ ] Yes, there are changes in this PR that warrants bumping the Pulumi Service API version
  <!-- `@Pulumi` employees: If yes, you must submit corresponding changes in the service repo. -->


Co-authored-by: Fraser Waters <fraser@pulumi.com>
  • Loading branch information
bors[bot] and Frassle committed Nov 30, 2022
2 parents 87b18a6 + d8f3109 commit 7afac76
Show file tree
Hide file tree
Showing 45 changed files with 7 additions and 45 deletions.
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: sdkgen/go
description: Fixes superfluous newline being added between documentation comment and package statement in doc.go
5 changes: 3 additions & 2 deletions pkg/codegen/go/gen.go
Expand Up @@ -841,6 +841,9 @@ func (pkg *pkgContext) toOutputMethod(t schema.Type) string {
return "To" + outputTypeName
}

// printComment filters examples for the Go languages and prepends double forward slash to each line in the given
// comment. If indent is true, each line is indented with tab character. It returns the number of lines in the
// resulting comment. It guarantees that each line is terminated with newline character.
func printComment(w io.Writer, comment string, indent bool) int {
comment = codegen.FilterExamples(comment, "go")

Expand Down Expand Up @@ -1315,7 +1318,6 @@ func (pkg *pkgContext) fieldName(r *schema.Resource, field *schema.Property) str

func (pkg *pkgContext) genPlainType(w io.Writer, name, comment, deprecationMessage string,
properties []*schema.Property) {

printCommentWithDeprecationMessage(w, comment, deprecationMessage, false)
fmt.Fprintf(w, "type %s struct {\n", name)
for _, p := range properties {
Expand Down Expand Up @@ -3605,7 +3607,6 @@ func GeneratePackage(tool string, pkg *schema.Package) (map[string][]byte, error
} else {
fmt.Fprintf(buffer, "// Package %[1]s exports types, functions, subpackages for provisioning %[1]s resources.\n", name)
}
fmt.Fprintf(buffer, "\n")
fmt.Fprintf(buffer, "package %s\n", name)

setFile(path.Join(mod, "doc.go"), buffer.String())
Expand Down
@@ -1,3 +1,2 @@
// A native Pulumi package for creating and managing Azure resources.

package azure
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package foo exports types, functions, subpackages for provisioning foo resources.

package foo
@@ -1,3 +1,2 @@
// Package plantprovider exports types, functions, subpackages for provisioning plantprovider resources.

package plantprovider
@@ -1,3 +1,2 @@
// Package plant exports types, functions, subpackages for provisioning plant resources.

package plant
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package mypkg exports types, functions, subpackages for provisioning mypkg resources.

package mypkg
@@ -1,3 +1,2 @@
// Package repro exports types, functions, subpackages for provisioning repro resources.

package repro
@@ -1,3 +1,2 @@
// Package repro exports types, functions, subpackages for provisioning repro resources.

package repro
@@ -1,3 +1,2 @@
// Package registrygeoreplication exports types, functions, subpackages for provisioning registrygeoreplication resources.

package registrygeoreplication
@@ -1,3 +1,2 @@
// Package repro exports types, functions, subpackages for provisioning repro resources.

package repro
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package foo exports types, functions, subpackages for provisioning foo resources.

package foo
@@ -1,3 +1,2 @@
// Package foo exports types, functions, subpackages for provisioning foo resources.

package foo
@@ -1,3 +1,2 @@
// Package myedgeorder exports types, functions, subpackages for provisioning myedgeorder resources.

package myedgeorder
@@ -1,3 +1,2 @@
// Package mypkg exports types, functions, subpackages for provisioning mypkg resources.

package mypkg
@@ -1,3 +1,2 @@
// Package mypkg exports types, functions, subpackages for provisioning mypkg resources.

package mypkg
@@ -1,3 +1,2 @@
// Package foo exports types, functions, subpackages for provisioning foo resources.

package foo
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package xyz exports types, functions, subpackages for provisioning xyz resources.

package xyz
@@ -1,3 +1,2 @@
// Package configstation exports types, functions, subpackages for provisioning configstation resources.

package configstation
@@ -1,3 +1,2 @@
// Package mongodbatlas exports types, functions, subpackages for provisioning mongodbatlas resources.

package mongodbatlas
@@ -1,3 +1,2 @@
// Package world exports types, functions, subpackages for provisioning world resources.

package world
@@ -1,3 +1,2 @@
// Package my8664 exports types, functions, subpackages for provisioning my8664 resources.

package my8664
@@ -1,3 +1,2 @@
// Package my8110 exports types, functions, subpackages for provisioning my8110 resources.

package my8110
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
1 change: 0 additions & 1 deletion pkg/codegen/testing/test/testdata/secrets/go/mypkg/doc.go
@@ -1,3 +1,2 @@
// Package mypkg exports types, functions, subpackages for provisioning mypkg resources.

package mypkg
@@ -1,3 +1,2 @@
// Package plant exports types, functions, subpackages for provisioning plant resources.

package plant
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package different exports types, functions, subpackages for provisioning different resources.

package different
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example
@@ -1,3 +1,2 @@
// Package example exports types, functions, subpackages for provisioning example resources.

package example

0 comments on commit 7afac76

Please sign in to comment.