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

chore: fmt modify #21069

Merged
merged 1 commit into from
Jun 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/tools/generator/autorest/generation.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func scannerPrint(scanner *bufio.Scanner, writer io.Writer, prefix string) error
}
for scanner.Scan() {
line := scanner.Text()
if _, err := fmt.Fprintln(writer, fmt.Sprintf("%s%s", prefix, line)); err != nil {
if _, err := fmt.Fprintf(writer, "%s%s\n", prefix, line); err != nil {
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/generator/autorest/model/changelog.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (c Changelog) GetChangeSummary() string {
func (c Changelog) GetBreakingChangeItems() []string {
if c.RemovedPackage {
return []string{
fmt.Sprintf("Package was removed"),
"Package was removed",
}
}
if c.Modified == nil {
Expand Down
15 changes: 7 additions & 8 deletions eng/tools/generator/cmd/v2/common/changelogProcessor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package common_test

import (
"fmt"
"testing"

"github.com/Azure/azure-sdk-for-go/eng/tools/generator/autorest"
Expand All @@ -31,7 +30,7 @@ func TestEnumFilter(t *testing.T) {

common.FilterChangelog(changelog, common.EnumFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Enum `EnumRemove` has been removed\n\n### Features Added\n\n- New value `EnumExistB` added to enum type `EnumExist`\n- New enum type `EnumAdd` with values `EnumAddA`, `EnumAddB`\n")
excepted := "### Breaking Changes\n\n- Enum `EnumRemove` has been removed\n\n### Features Added\n\n- New value `EnumExistB` added to enum type `EnumExist`\n- New enum type `EnumAdd` with values `EnumAddA`, `EnumAddB`\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -53,7 +52,7 @@ func TestFuncFilter(t *testing.T) {

common.FilterChangelog(changelog, common.FuncFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Function `*Client.BeingDelete` has been removed\n- Function `*Client.NewListPager` has been removed\n- Function `*Client.Update` has been removed\n\n### Features Added\n\n- New function `*Client.BeginCreateOrUpdate(string, *ClientBeginCreateOrUpdateOptions) (ClientBeginCreateOrUpdateResponse, error)`\n- New function `*Client.NewListBySubscriptionPager(*ClientListBySubscriptionOptions) *runtime.Pager[ClientListBySubscriptionResponse]`\n")
excepted := "### Breaking Changes\n\n- Function `*Client.BeingDelete` has been removed\n- Function `*Client.NewListPager` has been removed\n- Function `*Client.Update` has been removed\n\n### Features Added\n\n- New function `*Client.BeginCreateOrUpdate(string, *ClientBeginCreateOrUpdateOptions) (ClientBeginCreateOrUpdateResponse, error)`\n- New function `*Client.NewListBySubscriptionPager(*ClientListBySubscriptionOptions) *runtime.Pager[ClientListBySubscriptionResponse]`\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -75,7 +74,7 @@ func TestLROFilter(t *testing.T) {

common.FilterChangelog(changelog, common.FuncFilter, common.LROFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Operation `*Client.BeginDelete` has been changed to non-LRO, use `*Client.Delete` instead.\n- Operation `*Client.CreateOrUpdate` has been changed to LRO, use `*Client.BeginCreateOrUpdate` instead.\n")
excepted := "### Breaking Changes\n\n- Operation `*Client.BeginDelete` has been changed to non-LRO, use `*Client.Delete` instead.\n- Operation `*Client.CreateOrUpdate` has been changed to LRO, use `*Client.BeginCreateOrUpdate` instead.\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -97,7 +96,7 @@ func TestPageableFilter(t *testing.T) {

common.FilterChangelog(changelog, common.FuncFilter, common.PageableFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Operation `*Client.GetLog` has supported pagination, use `*Client.NewGetLogPager` instead.\n- Operation `*Client.NewListPager` does not support pagination anymore, use `*Client.List` instead.\n")
excepted := "### Breaking Changes\n\n- Operation `*Client.GetLog` has supported pagination, use `*Client.NewGetLogPager` instead.\n- Operation `*Client.NewListPager` does not support pagination anymore, use `*Client.List` instead.\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -119,7 +118,7 @@ func TestInterfaceToAnyFilter(t *testing.T) {

common.FilterChangelog(changelog, common.InterfaceToAnyFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Type of `Interface2Any.NewType` has been changed from `interface{}` to `string`\n")
excepted := "### Breaking Changes\n\n- Type of `Interface2Any.NewType` has been changed from `interface{}` to `string`\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -139,7 +138,7 @@ func TestTypeToAny(t *testing.T) {
t.Fatal(err)
}

excepted := fmt.Sprint("### Breaking Changes\n\n- Type of `Client.M` has been changed from `map[string]string` to `map[string]any`\n\n### Features Added\n\n- Type of `Client.A` has been changed from `*int` to `any`\n")
excepted := "### Breaking Changes\n\n- Type of `Client.M` has been changed from `map[string]string` to `map[string]any`\n\n### Features Added\n\n- Type of `Client.A` has been changed from `*int` to `any`\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}

Expand All @@ -161,6 +160,6 @@ func TestFuncParameterChange(t *testing.T) {

common.FilterChangelog(changelog, common.FuncFilter)

excepted := fmt.Sprint("### Breaking Changes\n\n- Function `*Client.AfterAny` parameter(s) have been changed from `(context.Context, string, string, interface{}, ClientOption)` to `(context.Context, string, string, any, Option)`\n- Function `*Client.BeforeAny` parameter(s) have been changed from `(context.Context, string, string, interface{}, ClientOption)` to `(context.Context, string, any, any, ClientOption)`\n")
excepted := "### Breaking Changes\n\n- Function `*Client.AfterAny` parameter(s) have been changed from `(context.Context, string, string, interface{}, ClientOption)` to `(context.Context, string, string, any, Option)`\n- Function `*Client.BeforeAny` parameter(s) have been changed from `(context.Context, string, string, interface{}, ClientOption)` to `(context.Context, string, any, any, ClientOption)`\n"
assert.Equal(t, excepted, changelog.ToCompactMarkdown())
}