diff --git a/internal/bake/hcl/completion_test.go b/internal/bake/hcl/completion_test.go index f87d60e..6e0b8f9 100644 --- a/internal/bake/hcl/completion_test.go +++ b/internal/bake/hcl/completion_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" "testing" - "time" "github.com/docker/docker-language-server/internal/pkg/document" "github.com/docker/docker-language-server/internal/tliron/glsp/protocol" "github.com/docker/docker-language-server/internal/types" + "github.com/dromara/carbon/v2" "github.com/hashicorp/hcl/v2" "github.com/stretchr/testify/require" "go.lsp.dev/uri" @@ -748,7 +748,7 @@ func TestIsInsideRange(t *testing.T) { } func createFileStructure(t *testing.T) string { - dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), time.Now().UnixMilli())) + dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), carbon.Now().TimestampMilli())) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, os.RemoveAll(dir)) diff --git a/internal/compose/completion_test.go b/internal/compose/completion_test.go index 529c8f2..d51f9a3 100644 --- a/internal/compose/completion_test.go +++ b/internal/compose/completion_test.go @@ -8,12 +8,12 @@ import ( "runtime" "strings" "testing" - "time" "github.com/docker/docker-language-server/internal/hub" "github.com/docker/docker-language-server/internal/pkg/document" "github.com/docker/docker-language-server/internal/tliron/glsp/protocol" "github.com/docker/docker-language-server/internal/types" + "github.com/dromara/carbon/v2" "github.com/stretchr/testify/require" "go.lsp.dev/uri" ) @@ -2853,7 +2853,7 @@ services: }, } - dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), time.Now().UnixMilli())) + dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), carbon.Now().TimestampMilli())) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, os.RemoveAll(dir)) @@ -4607,7 +4607,7 @@ services: } func TestCompletion_NoResultExpected(t *testing.T) { - dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), time.Now().UnixMilli())) + dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), carbon.Now().TimestampMilli())) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, os.RemoveAll(dir)) @@ -4741,7 +4741,7 @@ services: } func TestCompletion_VolumeFolderListing(t *testing.T) { - dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), time.Now().UnixMilli())) + dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), carbon.Now().TimestampMilli())) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, os.RemoveAll(dir)) @@ -5540,7 +5540,7 @@ func textEdit(newText string, line, character, prefixLength protocol.UInteger) p } func createFileStructure(t *testing.T) string { - dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), time.Now().UnixMilli())) + dir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("%v-%v", t.Name(), carbon.Now().TimestampMilli())) require.NoError(t, err) t.Cleanup(func() { require.NoError(t, os.RemoveAll(dir)) diff --git a/internal/telemetry/client.go b/internal/telemetry/client.go index 3de58e8..90dd88e 100644 --- a/internal/telemetry/client.go +++ b/internal/telemetry/client.go @@ -8,10 +8,10 @@ import ( "net/http" "os" "sync" - "time" "github.com/docker/docker-language-server/internal/configuration" "github.com/docker/docker-language-server/internal/pkg/cli/metadata" + "github.com/dromara/carbon/v2" ) const apiKey = "eIxc3dSmud2vuJRKiq9hJ6wORVWfoLxp1nqb4qXz" @@ -65,7 +65,7 @@ func (c *TelemetryClientImpl) Enqueue(event string, properties map[string]any) { Event: event, Source: "editor_integration", Properties: properties, - Timestamp: int64(time.Now().UnixMilli()), + Timestamp: carbon.Now().TimestampMilli(), }) } } diff --git a/releaser/main.go b/releaser/main.go index 9c324ce..abb094f 100644 --- a/releaser/main.go +++ b/releaser/main.go @@ -7,7 +7,8 @@ import ( "regexp" "strconv" "strings" - "time" + + "github.com/dromara/carbon/v2" ) const localChangelogPath = "./CHANGELOG.md" @@ -157,7 +158,7 @@ func bumpVersion(version, versionType string) (string, error) { } func today() string { - return time.Now().UTC().Format(time.DateOnly) + return carbon.Now().ToDateString() } func updateLinks(linkLines []string, newVersion, previousVersion string) []string { diff --git a/releaser/main_test.go b/releaser/main_test.go index 8bb73ef..28a5b99 100644 --- a/releaser/main_test.go +++ b/releaser/main_test.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" "testing" - "time" + "github.com/dromara/carbon/v2" "github.com/stretchr/testify/require" ) @@ -24,7 +24,7 @@ func TestUpdateChangelog(t *testing.T) { expectedLines, err := readFileLines(expectedPath) require.NoError(t, err, "failed to read expected file: %v", expectedPath) - today := time.Now().Format("2006-01-02") + today := carbon.Now().ToDateString() expectedVersionLine := fmt.Sprintf("## [0.16.0] - %s", today) for i := range resultLines {