Skip to content

simplified code via carbon #454

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −13
Open

simplified code via carbon #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7cd03b
simplified code via carbon
kuafuRace Aug 22, 2025
5adb81d
Merge branch 'docker:main' into main
kuafuRace Aug 22, 2025
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
4 changes: 2 additions & 2 deletions internal/bake/hcl/completion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
10 changes: 5 additions & 5 deletions internal/compose/completion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions internal/telemetry/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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(),
})
}
}
Expand Down
5 changes: 3 additions & 2 deletions releaser/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import (
"regexp"
"strconv"
"strings"
"time"

"github.com/dromara/carbon/v2"
)

const localChangelogPath = "./CHANGELOG.md"
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions releaser/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"testing"
"time"

"github.com/dromara/carbon/v2"
"github.com/stretchr/testify/require"
)

Expand All @@ -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 {
Expand Down
Loading