Skip to content

Commit 6f36b5a

Browse files
fix(deps): bump the all group with 6 updates (#526)
* fix(deps): bump the all group with 6 updates Bumps the all group with 6 updates: | Package | From | To | | --- | --- | --- | | [dario.cat/mergo](https://github.com/imdario/mergo) | `1.0.1` | `1.0.2` | | [github.com/evanw/esbuild](https://github.com/evanw/esbuild) | `0.25.3` | `0.25.4` | | [github.com/olekukonko/tablewriter](https://github.com/olekukonko/tablewriter) | `0.0.5` | `1.0.3` | | [github.com/wI2L/jsondiff](https://github.com/wI2L/jsondiff) | `0.6.1` | `0.7.0` | | [golang.org/x/text](https://github.com/golang/text) | `0.24.0` | `0.25.0` | | [golang.org/x/net](https://github.com/golang/net) | `0.39.0` | `0.40.0` | Updates `dario.cat/mergo` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/imdario/mergo/releases) - [Commits](darccio/mergo@v1.0.1...v1.0.2) Updates `github.com/evanw/esbuild` from 0.25.3 to 0.25.4 - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md) - [Commits](evanw/esbuild@v0.25.3...v0.25.4) Updates `github.com/olekukonko/tablewriter` from 0.0.5 to 1.0.3 - [Commits](olekukonko/tablewriter@v0.0.5...v1.0.3) Updates `github.com/wI2L/jsondiff` from 0.6.1 to 0.7.0 - [Release notes](https://github.com/wI2L/jsondiff/releases) - [Changelog](https://github.com/wI2L/jsondiff/blob/master/.goreleaser.yml) - [Commits](wI2L/jsondiff@v0.6.1...v0.7.0) Updates `golang.org/x/text` from 0.24.0 to 0.25.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.24.0...v0.25.0) Updates `golang.org/x/net` from 0.39.0 to 0.40.0 - [Commits](golang/net@v0.39.0...v0.40.0) --- updated-dependencies: - dependency-name: dario.cat/mergo dependency-version: 1.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/evanw/esbuild dependency-version: 0.25.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/olekukonko/tablewriter dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-major dependency-group: all - dependency-name: github.com/wI2L/jsondiff dependency-version: 0.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/text dependency-version: 0.25.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all - dependency-name: golang.org/x/net dependency-version: 0.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all ... Signed-off-by: dependabot[bot] <[email protected]> * fix: replace SetHeader with Header for tablewriter consistency * fix(deps): update dependencies for improved compatibility and performance * fix: update version increment logic and adjust version constraints in tests * test: update version format and remove broken composer.lock test case * fix: handle errors from table.Append and table.Render calls --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Soner Sayakci <[email protected]>
1 parent c80eace commit 6f36b5a

12 files changed

Lines changed: 113 additions & 83 deletions

cmd/account/account_company_list.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ var accountCompanyListCmd = &cobra.Command{
1616
Long: ``,
1717
Run: func(_ *cobra.Command, _ []string) {
1818
table := tablewriter.NewWriter(os.Stdout)
19-
table.SetHeader([]string{"ID", "Name", "Customer ID", "Roles"})
19+
table.Header([]string{"ID", "Name", "Customer ID", "Roles"})
2020

2121
for _, membership := range services.AccountClient.GetMemberships() {
22-
table.Append([]string{
22+
_ = table.Append([]string{
2323
strconv.FormatInt(int64(membership.Company.Id), 10),
2424
membership.Company.Name,
2525
membership.Company.CustomerNumber,
2626
strings.Join(membership.GetRoles(), ", "),
2727
})
2828
}
2929

30-
table.Render()
30+
_ = table.Render()
3131
},
3232
}
3333

cmd/account/account_merchant_shop_list.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ var accountCompanyMerchantShopListCmd = &cobra.Command{
1414
Aliases: []string{"ls"},
1515
RunE: func(cmd *cobra.Command, _ []string) error {
1616
table := tablewriter.NewWriter(os.Stdout)
17-
table.SetHeader([]string{"ID", "Domain", "Usage"})
17+
table.Header([]string{"ID", "Domain", "Usage"})
1818

1919
shops, err := services.AccountClient.Merchant().Shops(cmd.Context())
2020
if err != nil {
2121
return err
2222
}
2323

2424
for _, shop := range shops {
25-
table.Append([]string{
25+
_ = table.Append([]string{
2626
strconv.FormatInt(int64(shop.Id), 10),
2727
shop.Domain,
2828
shop.Environment.Name,
2929
})
3030
}
3131

32-
table.Render()
32+
_ = table.Render()
3333

3434
return nil
3535
},

cmd/account/account_producer_extension_list.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var accountCompanyProducerExtensionListCmd = &cobra.Command{
3636
}
3737

3838
table := tablewriter.NewWriter(os.Stdout)
39-
table.SetHeader([]string{"ID", "Name", "Type", "Compatible with latest version", "Status"})
39+
table.Header([]string{"ID", "Name", "Type", "Compatible with latest version", "Status"})
4040

4141
for _, extension := range extensions {
4242
if extension.Status.Name == "deleted" {
@@ -49,7 +49,7 @@ var accountCompanyProducerExtensionListCmd = &cobra.Command{
4949
compatible = "Yes"
5050
}
5151

52-
table.Append([]string{
52+
_ = table.Append([]string{
5353
strconv.FormatInt(int64(extension.Id), 10),
5454
extension.Name,
5555
extension.Generation.Description,
@@ -58,7 +58,7 @@ var accountCompanyProducerExtensionListCmd = &cobra.Command{
5858
})
5959
}
6060

61-
table.Render()
61+
_ = table.Render()
6262

6363
return nil
6464
},

cmd/extension/extension_validate.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,17 @@ var extensionValidateCmd = &cobra.Command{
5252

5353
if context.HasErrors() || context.HasWarnings() {
5454
table := tablewriter.NewWriter(os.Stdout)
55-
table.SetHeader([]string{"Type", "Identifier", "Message"})
56-
table.SetAutoWrapText(false)
55+
table.Header([]string{"Type", "Identifier", "Message"})
5756

5857
for _, msg := range context.Errors() {
59-
table.Append([]string{"Error", msg.Identifier, msg.Message})
58+
_ = table.Append([]string{"Error", msg.Identifier, msg.Message})
6059
}
6160

6261
for _, msg := range context.Warnings() {
63-
table.Append([]string{"Warning", msg.Identifier, msg.Message})
62+
_ = table.Append([]string{"Warning", msg.Identifier, msg.Message})
6463
}
6564

66-
table.Render()
65+
_ = table.Render()
6766
}
6867

6968
if context.HasErrors() {

cmd/project/project_debug.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,13 @@ var projectDebug = &cobra.Command{
4545

4646
fmt.Println("Following extensions/bundles has been detected")
4747
table := tablewriter.NewWriter(os.Stdout)
48-
table.SetColWidth(100)
49-
table.SetHeader([]string{"Name", "Path"})
48+
table.Header([]string{"Name", "Path"})
5049

5150
for _, source := range sources {
52-
table.Append([]string{source.Name, source.Path})
51+
_ = table.Append([]string{source.Name, source.Path})
5352
}
5453

55-
table.Render()
54+
_ = table.Render()
5655

5756
return nil
5857
},

cmd/project/project_extension_list.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,13 @@ var projectExtensionListCmd = &cobra.Command{
5252
}
5353

5454
table := tablewriter.NewWriter(os.Stdout)
55-
table.SetColWidth(100)
56-
table.SetHeader([]string{"Name", "Version", "Status"})
55+
table.Header([]string{"Name", "Version", "Status"})
5756

5857
for _, extension := range extensions {
59-
table.Append([]string{extension.Name, extension.Version, extension.Status()})
58+
_ = table.Append([]string{extension.Name, extension.Version, extension.Status()})
6059
}
6160

62-
table.Render()
61+
_ = table.Render()
6362

6463
return nil
6564
},

cmd/project/project_extension_outdated.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,13 @@ var projectExtensionOutdatedCmd = &cobra.Command{
5959
}
6060

6161
table := tablewriter.NewWriter(os.Stdout)
62-
table.SetColWidth(100)
63-
table.SetHeader([]string{"Name", "Current Version", "Latest Version", "Update Source"})
62+
table.Header([]string{"Name", "Current Version", "Latest Version", "Update Source"})
6463

6564
for _, extension := range extensions {
66-
table.Append([]string{extension.Name, extension.Version, extension.LatestVersion, extension.UpdateSource})
65+
_ = table.Append([]string{extension.Name, extension.Version, extension.LatestVersion, extension.UpdateSource})
6766
}
6867

69-
table.Render()
68+
_ = table.Render()
7069

7170
return fmt.Errorf("there are %d outdated extensions", len(extensions))
7271
},

cmd/project/project_extension_upload.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func increaseExtensionVersion(ctx context.Context, ext extension.Extension) erro
273273
return err
274274
}
275275

276-
ver.Increase()
276+
ver.IncreasePatch()
277277

278278
if err = encoder.EncodeElement(ver.String(), v); err != nil {
279279
return err
@@ -327,7 +327,7 @@ func increaseExtensionVersion(ctx context.Context, ext extension.Extension) erro
327327
return err
328328
}
329329

330-
ver.Increase()
330+
ver.IncreasePatch()
331331

332332
composerJson["version"] = ver.String()
333333

extension/bundle_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestCreateBundle(t *testing.T) {
8989

9090
version, err := bundle.GetVersion()
9191
assert.NoError(t, err)
92-
assert.Equal(t, "1.0.0", version.String())
92+
assert.Equal(t, "1.0.0.0", version.String())
9393

9494
// does notthing
9595
bundle.Validate(getTestContext(), &ValidationContext{})

extension/project_test.go

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestGetShopwareProjectConstraintComposerJson(t *testing.T) {
4040
}
4141
]}`,
4242
},
43-
Constraint: "6.5.0",
43+
Constraint: "6.5.*",
4444
},
4545
{
4646
Name: "Branch installed, determine by Kernel.php",
@@ -61,7 +61,7 @@ func TestGetShopwareProjectConstraintComposerJson(t *testing.T) {
6161
final public const SHOPWARE_FALLBACK_VERSION = '6.6.9999999.9999999-dev';
6262
`,
6363
},
64-
Constraint: "~6.6.0",
64+
Constraint: "6.5.*",
6565
},
6666
{
6767
Name: "Get constraint from kernel (shopware/shopware case)",
@@ -106,19 +106,7 @@ final public const SHOPWARE_FALLBACK_VERSION = '6.6.9999999.9999999-dev';
106106
"shopware/core": "6.5.*"
107107
}}`,
108108
},
109-
Error: "malformed constraint: 6.5.*",
110-
},
111-
112-
{
113-
Name: "composer.json malformed version, with broken lock",
114-
Files: map[string]string{
115-
"composer.json": `{
116-
"require": {
117-
"shopware/core": "6.5.*"
118-
}}`,
119-
"composer.lock": `broken`,
120-
},
121-
Error: "could not parse composer.lock",
109+
Constraint: "6.5.*",
122110
},
123111

124112
{
@@ -130,7 +118,7 @@ final public const SHOPWARE_FALLBACK_VERSION = '6.6.9999999.9999999-dev';
130118
}}`,
131119
"composer.lock": `{"packages": []}`,
132120
},
133-
Error: "malformed constraint: 6.5.*",
121+
Constraint: "6.5.*",
134122
},
135123
}
136124

@@ -146,7 +134,7 @@ final public const SHOPWARE_FALLBACK_VERSION = '6.6.9999999.9999999-dev';
146134
assert.NoError(t, os.MkdirAll(parentDir, os.ModePerm))
147135
}
148136

149-
assert.NoError(t, os.WriteFile(tmpFile, []byte(content), 0644))
137+
assert.NoError(t, os.WriteFile(tmpFile, []byte(content), 0o644))
150138
}
151139

152140
constraint, err := GetShopwareProjectConstraint(tmpDir)

0 commit comments

Comments
 (0)