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

⬆️ bump the gomod-deps group with 8 updates #528

Closed
wants to merge 3 commits into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 1, 2024

Bumps the gomod-deps group with 8 updates:

Package From To
github.com/arran4/golang-ical 0.2.1 0.2.6
github.com/jszwec/csvutil 1.8.0 1.10.0
github.com/labstack/echo/v4 4.11.3 4.11.4
go.uber.org/zap 1.26.0 1.27.0
golang.org/x/oauth2 0.15.0 0.17.0
google.golang.org/api 0.152.0 0.167.0
gorm.io/driver/mysql 1.5.2 1.5.4
gorm.io/gorm 1.25.5 1.25.7-0.20240204074919-46816ad31dde

Updates github.com/arran4/golang-ical from 0.2.1 to 0.2.6

Release notes

Sourced from github.com/arran4/golang-ical's releases.

v0.2.6

What's Changed

Full Changelog: arran4/golang-ical@v0.2.5...v0.2.6

v0.2.5

What's Changed

New Contributors

Full Changelog: arran4/golang-ical@v0.2.4...v0.2.5

v0.2.3

No release notes provided.

v0.2.2

No release notes provided.

Commits
  • 0fcebed Merge pull request #87 from JM-Lemmi/fix/text_escaping
  • bb39d64 Revert "fix: only escape property values when serializing."
  • 7bd8708 test: Add test for escaped semicolons in RRULEs
  • 542d6e5 Merge pull request #86 from JM-Lemmi/fix/text_escaping
  • 647cf9e test: Add test for escaped semicolons in property parameters
  • 0f8a325 fix: reorder string replaces in escaping values.
  • 3ffa099 fix: only escape property values when serializing.
  • 51fa6f1 Merge pull request #85 from brackendawson/panic
  • 46e2a5c Exclude fuzz testing from pre-1.18 toolchains
  • a8f0586 fix panic when param value has incomplete escape sequence
  • Additional commits viewable in compare view

Updates github.com/jszwec/csvutil from 1.8.0 to 1.10.0

Release notes

Sourced from github.com/jszwec/csvutil's releases.

Release v1.10.0

What's Changed

New Contributors

Full Changelog: jszwec/csvutil@v1.9.0...v1.10.0

Release v1.9.0

Highlights

  • Added AlignRecord flag to Decoder
Commits
  • 53deda7 feat: allow struct slice and struct array for valueType (#70)
  • 4c3b8e6 feat: add AlignRecord flag to Decoder
  • 5633865 chore: update github workflow to use Go1.21
  • 05adbbb Add package name when using NewDecoder function (#61)
  • See full diff in compare view

Updates github.com/labstack/echo/v4 from 4.11.3 to 4.11.4

Release notes

Sourced from github.com/labstack/echo/v4's releases.

v4.11.4 upgrade dependencies

Security

  • Upgrade golang.org/x/crypto to v0.17.0 to fix vulnerability issue #2562

Enhancements

Changelog

Sourced from github.com/labstack/echo/v4's changelog.

v4.11.4 - 2023-12-20

Security

  • Upgrade golang.org/x/crypto to v0.17.0 to fix vulnerability issue #2562

Enhancements

Commits

Updates go.uber.org/zap from 1.26.0 to 1.27.0

Release notes

Sourced from go.uber.org/zap's releases.

v1.27.0

Enhancements:

  • #1378[]: Add WithLazy method for SugaredLogger.
  • #1399[]: zaptest: Add NewTestingWriter for customizing TestingWriter with more flexibility than NewLogger.
  • #1406[]: Add Log, Logw, Logln methods for SugaredLogger.
  • #1416[]: Add WithPanicHook option for testing panic logs.

Thanks to @​defval, @​dimmo, @​arxeiss, and @​MKrupauskas for their contributions to this release.

#1378: uber-go/zap#1378 #1399: uber-go/zap#1399 #1406: uber-go/zap#1406 #1416: uber-go/zap#1416

Changelog

Sourced from go.uber.org/zap's changelog.

1.27.0 (20 Feb 2024)

Enhancements:

  • #1378[]: Add WithLazy method for SugaredLogger.
  • #1399[]: zaptest: Add NewTestingWriter for customizing TestingWriter with more flexibility than NewLogger.
  • #1406[]: Add Log, Logw, Logln methods for SugaredLogger.
  • #1416[]: Add WithPanicHook option for testing panic logs.

Thanks to @​defval, @​dimmo, @​arxeiss, and @​MKrupauskas for their contributions to this release.

#1378: uber-go/zap#1378 #1399: uber-go/zap#1399 #1406: uber-go/zap#1406 #1416: uber-go/zap#1416

Commits

Updates golang.org/x/oauth2 from 0.15.0 to 0.17.0

Commits
  • ebe81ad go.mod: update golang.org/x dependencies
  • adffd94 google/internal/externalaccount: update serviceAccountImpersonationRE to supp...
  • deefa7e google/downscope: add DownscopingConfig.UniverseDomain to support TPC
  • 39adbb7 go.mod: update golang.org/x dependencies
  • 4ce7bbb google: add Credentials.GetUniverseDomain with GCE MDS support
  • 1e6999b google: add UniverseDomain to CredentialsParams
  • See full diff in compare view

Updates google.golang.org/api from 0.152.0 to 0.167.0

Release notes

Sourced from google.golang.org/api's releases.

v0.167.0

0.167.0 (2024-02-23)

Features

v0.166.0

0.166.0 (2024-02-21)

Features

v0.165.0

0.165.0 (2024-02-14)

Features

v0.164.0

0.164.0 (2024-02-12)

Features

Bug Fixes

  • transport: Disable universe domain check if token source (#2413) (edbe996)

v0.163.0

0.163.0 (2024-02-08)

... (truncated)

Changelog

Sourced from google.golang.org/api's changelog.

0.167.0 (2024-02-23)

Features

0.166.0 (2024-02-21)

Features

0.165.0 (2024-02-14)

Features

0.164.0 (2024-02-12)

Features

Bug Fixes

  • transport: Disable universe domain check if token source (#2413) (edbe996)

0.163.0 (2024-02-08)

Features

... (truncated)

Commits

Updates gorm.io/driver/mysql from 1.5.2 to 1.5.4

Commits

Updates gorm.io/gorm from 1.25.5 to 1.25.7-0.20240204074919-46816ad31dde

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps the gomod-deps group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [github.com/arran4/golang-ical](https://github.com/arran4/golang-ical) | `0.2.1` | `0.2.6` |
| [github.com/jszwec/csvutil](https://github.com/jszwec/csvutil) | `1.8.0` | `1.10.0` |
| [github.com/labstack/echo/v4](https://github.com/labstack/echo) | `4.11.3` | `4.11.4` |
| [go.uber.org/zap](https://github.com/uber-go/zap) | `1.26.0` | `1.27.0` |
| [golang.org/x/oauth2](https://github.com/golang/oauth2) | `0.15.0` | `0.17.0` |
| [google.golang.org/api](https://github.com/googleapis/google-api-go-client) | `0.152.0` | `0.167.0` |
| [gorm.io/driver/mysql](https://github.com/go-gorm/mysql) | `1.5.2` | `1.5.4` |
| [gorm.io/gorm](https://github.com/go-gorm/gorm) | `1.25.5` | `1.25.7-0.20240204074919-46816ad31dde` |


Updates `github.com/arran4/golang-ical` from 0.2.1 to 0.2.6
- [Release notes](https://github.com/arran4/golang-ical/releases)
- [Commits](arran4/golang-ical@v0.2.1...v0.2.6)

Updates `github.com/jszwec/csvutil` from 1.8.0 to 1.10.0
- [Release notes](https://github.com/jszwec/csvutil/releases)
- [Commits](jszwec/csvutil@v1.8.0...v1.10.0)

Updates `github.com/labstack/echo/v4` from 4.11.3 to 4.11.4
- [Release notes](https://github.com/labstack/echo/releases)
- [Changelog](https://github.com/labstack/echo/blob/master/CHANGELOG.md)
- [Commits](labstack/echo@v4.11.3...v4.11.4)

Updates `go.uber.org/zap` from 1.26.0 to 1.27.0
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](uber-go/zap@v1.26.0...v1.27.0)

Updates `golang.org/x/oauth2` from 0.15.0 to 0.17.0
- [Commits](golang/oauth2@v0.15.0...v0.17.0)

Updates `google.golang.org/api` from 0.152.0 to 0.167.0
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.152.0...v0.167.0)

Updates `gorm.io/driver/mysql` from 1.5.2 to 1.5.4
- [Commits](go-gorm/mysql@v1.5.2...v1.5.4)

Updates `gorm.io/gorm` from 1.25.5 to 1.25.7-0.20240204074919-46816ad31dde
- [Release notes](https://github.com/go-gorm/gorm/releases)
- [Commits](https://github.com/go-gorm/gorm/commits)

---
updated-dependencies:
- dependency-name: github.com/arran4/golang-ical
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gomod-deps
- dependency-name: github.com/jszwec/csvutil
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gomod-deps
- dependency-name: github.com/labstack/echo/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gomod-deps
- dependency-name: go.uber.org/zap
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gomod-deps
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gomod-deps
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gomod-deps
- dependency-name: gorm.io/driver/mysql
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gomod-deps
- dependency-name: gorm.io/gorm
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: gomod-deps
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels Mar 1, 2024
@dependabot dependabot bot requested review from iChemy and ras0q March 1, 2024 04:49
@iChemy
Copy link
Contributor

iChemy commented Mar 1, 2024

VTimezone周りの関数が整備されていたので利用しました

Copy link
Member

@ras0q ras0q left a comment

Choose a reason for hiding this comment

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

みました!

std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetfrom), "+0900")
std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetto), "+0900")
std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzname), "JST")
std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyDtstart), "19700101T000000")
tz.Components = append(tz.Components, &std)
cal.Components = append(cal.Components, &tz)
cal.AddVTimezone(tz)
Copy link
Member

Choose a reason for hiding this comment

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

arran4/golang-ical@14095cc#diff-414491c8e37212605f612587cf5cb5dbf1711eef4b733970d280b57f4e1011ceR710
これよく見つけましたね

やってることはcal.AddTimezone("Asia/Tokyo")と同じなのでそっちのがよさそう
他のComponentPropertyはAddPropertyで渡してるのが気になるのでそこらへんの行消しても問題ないか確認して欲しいです!

Copy link
Contributor

Choose a reason for hiding this comment

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

AddTimezone("Asia/Tokyo")だと出力が以下のようになってしまって

BEGIN:VTIMEZONE
TZID:Asia/Tokyo
END:VTIMEZONE

これはiCalのRFCのTime Zone Componentに関する以下の記述の「"STANDARD"か"DAYLIGHT"サブコンポーネントを少なくとも一つは含なければならない」に反するので良くなさそうです.(Macのカレンダーアプリ上での挙動に変化は見られませんでしたが...)
https://tex2e.github.io/rfc-translater/html/rfc5545.html#3-6-5--Time-Zone-Component

The "VTIMEZONE" calendar component MUST include the "TZID" property and at least one definition of a "STANDARD" or "DAYLIGHT" sub-component. The "STANDARD" or "DAYLIGHT" sub-component MUST include the "DTSTART", "TZOFFSETFROM", and "TZOFFSETTO" properties.

Copy link
Contributor

Choose a reason for hiding this comment

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

STANDARDサブコンポーネントのDTSTARTプロパティに関してはSetStartAt関数が用意されていました.
https://github.com/arran4/golang-ical/blob/0fcebed54126830e648865ec05e459ad213986df/components.go#L119

AddPropertyから直そうとすると以下のようになりそうで少し煩雑な気がしますがどうするのが正解でしょうか...

// Time Zone の使用が始まる日時
stdStartDateTimeString := "19700101T000000"
// stdStartDateTimeString の フォーマット (arran4/golang-ical内の定数を参考にした)
icalTimestampFormatLocal := "20060102T150405"
stdStartDateTime, _ := time.Parse(icalTimestampFormatLocal, stdStartDateTimeString)
std.SetStartAt(stdStartDateTime)

Copy link
Member

Choose a reason for hiding this comment

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

正直あんまりよくわかってないんですが

	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetfrom), "+0900")
	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetto), "+0900")
	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzname), "JST")

の部分は現状でも消してよいということですか?


AddPropertyから直そうとすると以下のようになりそうで少し煩雑な気がしますがどうするのが正解でしょうか...

stdStartDateTimeString := "19700101T000000"はunix時間の開始時刻なのでtime.Unix(0, 0)を使えば良さそう?
https://pkg.go.dev/time#Unix

Copy link
Contributor

@iChemy iChemy Mar 5, 2024

Choose a reason for hiding this comment

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

申し訳ありません...
RFC見てたら以下のような記述があって

The collection of properties that are used to define the "STANDARD" and "DAYLIGHT" sub-components include:

The mandatory "DTSTART" property gives the effective onset date and local time for the time zone sub-component definition. "DTSTART" in this usage MUST be specified as a date with a local time value.

STANDARDサブコンポーネントのDTSTARTはローカルタイムゾーンじゃないといけなくて
SetStartAtは内部でUTCに直してるのでここでの使用は不適切でした.https://github.com/arran4/golang-ical/blob/0fcebed54126830e648865ec05e459ad213986df/components.go#L120

なので,最終的には以下のような形になりそうです.
(DTSTART用のComponentProperty型の値は用意されてたのでそっちに変更しました)

func ICalFormat(events []*domain.Event, host string, userMap map[uuid.UUID]*domain.User) *ics.Calendar {
	var std ics.Standard
	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetfrom), "+0900")
	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzoffsetto), "+0900")
	std.ComponentBase.AddProperty(ics.ComponentProperty(ics.PropertyTzname), "JST")
	// ics.ComponentProperty(ics.PropertyDtstart) -> ics.ComponentPropertyDtStart
	std.ComponentBase.AddProperty(ics.ComponentPropertyDtStart, "19700101T000000")

	tz := ics.NewTimezone("Asia/Tokyo")
	tz.Components = append(tz.Components, &std)

	cal := ics.NewCalendar()
	cal.AddVTimezone(tz)
	for _, e := range events {
		vevent := iCalVeventFormat(e, host, userMap)
		cal.AddVEvent(vevent)
	}
	return cal
}

@iChemy
Copy link
Contributor

iChemy commented Mar 15, 2024

ics.ComponentProperty(ics.PropertyDtstart)ics.ComponentPropertyDtStartにする変更と
記述の位置を入れ替えるだけにとどめました

Copy link
Contributor Author

dependabot bot commented on behalf of github Apr 1, 2024

Looks like these dependencies are updatable in another way, so this is no longer needed.

@dependabot dependabot bot closed this Apr 1, 2024
@dependabot dependabot bot deleted the dependabot/go_modules/gomod-deps-5a8a792bad branch April 1, 2024 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file go Pull requests that update Go code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants