From 69c34390c08a25ca128bb4585efd54a97ee4f254 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 30 May 2025 12:32:03 +0200 Subject: [PATCH] daemon/logger: remove // import comments These comments were added to enforce using the correct import path for our packages ("github.com/docker/docker", not "github.com/moby/moby"). However, when working in go module mode (not GOPATH / vendor), they have no effect, so their impact is limited. Remove these imports in preparation of migrating our code to become an actual go module. Signed-off-by: Sebastiaan van Stijn --- daemon/logger/adapter.go | 2 +- daemon/logger/adapter_test.go | 2 +- daemon/logger/awslogs/cloudwatchlogs.go | 2 +- daemon/logger/awslogs/cloudwatchlogs_test.go | 2 +- daemon/logger/awslogs/cwlogsiface_mock_test.go | 2 +- daemon/logger/copier.go | 2 +- daemon/logger/copier_test.go | 2 +- daemon/logger/etwlogs/etwlogs_windows.go | 2 +- daemon/logger/factory.go | 2 +- daemon/logger/fluentd/fluentd.go | 2 +- daemon/logger/fluentd/fluentd_test.go | 3 ++- daemon/logger/gcplogs/gcplogging.go | 2 +- daemon/logger/gelf/gelf.go | 2 +- daemon/logger/gelf/gelf_test.go | 2 +- daemon/logger/journald/doc.go | 2 +- daemon/logger/journald/internal/export/export.go | 2 +- daemon/logger/journald/internal/fake/sender.go | 2 +- daemon/logger/journald/internal/sdjournal/doc.go | 2 +- daemon/logger/journald/internal/sdjournal/sdjournal.go | 2 +- daemon/logger/journald/journald.go | 2 +- daemon/logger/journald/journald_test.go | 2 +- daemon/logger/journald/read.go | 2 +- daemon/logger/journald/read_test.go | 2 +- daemon/logger/jsonfilelog/jsonfilelog.go | 2 +- daemon/logger/jsonfilelog/jsonfilelog_test.go | 2 +- daemon/logger/jsonfilelog/jsonlog/jsonlog.go | 2 +- daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go | 2 +- daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go | 2 +- daemon/logger/jsonfilelog/jsonlog/time_marshalling.go | 2 +- daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go | 2 +- daemon/logger/jsonfilelog/read.go | 2 +- daemon/logger/jsonfilelog/read_test.go | 2 +- daemon/logger/local/doc.go | 2 +- daemon/logger/local/local.go | 2 +- daemon/logger/logger.go | 2 +- daemon/logger/logger_test.go | 2 +- daemon/logger/loggertest/logreader.go | 2 +- daemon/logger/loggerutils/cache/local_cache.go | 2 +- daemon/logger/loggerutils/follow.go | 2 +- daemon/logger/loggerutils/log_tag.go | 2 +- daemon/logger/loggerutils/log_tag_test.go | 2 +- daemon/logger/loggerutils/logfile.go | 2 +- daemon/logger/loggerutils/logfile_race_test.go | 2 +- daemon/logger/loggerutils/logfile_test.go | 2 +- daemon/logger/loggerutils/sharedtemp.go | 2 +- daemon/logger/loggerutils/sharedtemp_test.go | 2 +- daemon/logger/loginfo.go | 2 +- daemon/logger/metrics.go | 2 +- daemon/logger/plugin.go | 2 +- daemon/logger/plugin_unix.go | 2 +- daemon/logger/plugin_unsupported.go | 2 +- daemon/logger/proxy.go | 2 +- daemon/logger/ring.go | 2 +- daemon/logger/ring_test.go | 2 +- daemon/logger/splunk/splunk.go | 2 +- daemon/logger/splunk/splunk_test.go | 2 +- daemon/logger/splunk/splunkhecmock_test.go | 2 +- daemon/logger/syslog/syslog.go | 2 +- daemon/logger/syslog/syslog_test.go | 2 +- daemon/logger/templates/templates.go | 2 +- daemon/logger/templates/templates_test.go | 2 +- 61 files changed, 62 insertions(+), 61 deletions(-) diff --git a/daemon/logger/adapter.go b/daemon/logger/adapter.go index bd5cf5f226..16a73f0314 100644 --- a/daemon/logger/adapter.go +++ b/daemon/logger/adapter.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/adapter_test.go b/daemon/logger/adapter_test.go index 00523d205d..9617e4b1af 100644 --- a/daemon/logger/adapter_test.go +++ b/daemon/logger/adapter_test.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/awslogs/cloudwatchlogs.go b/daemon/logger/awslogs/cloudwatchlogs.go index c0c483291c..75abd2dc7a 100644 --- a/daemon/logger/awslogs/cloudwatchlogs.go +++ b/daemon/logger/awslogs/cloudwatchlogs.go @@ -1,5 +1,5 @@ // Package awslogs provides the logdriver for forwarding container logs to Amazon CloudWatch Logs -package awslogs // import "github.com/docker/docker/daemon/logger/awslogs" +package awslogs import ( "context" diff --git a/daemon/logger/awslogs/cloudwatchlogs_test.go b/daemon/logger/awslogs/cloudwatchlogs_test.go index 1c26ae5797..66d643a0dc 100644 --- a/daemon/logger/awslogs/cloudwatchlogs_test.go +++ b/daemon/logger/awslogs/cloudwatchlogs_test.go @@ -1,4 +1,4 @@ -package awslogs // import "github.com/docker/docker/daemon/logger/awslogs" +package awslogs import ( "context" diff --git a/daemon/logger/awslogs/cwlogsiface_mock_test.go b/daemon/logger/awslogs/cwlogsiface_mock_test.go index 3d53949e2f..870335f2b7 100644 --- a/daemon/logger/awslogs/cwlogsiface_mock_test.go +++ b/daemon/logger/awslogs/cwlogsiface_mock_test.go @@ -1,4 +1,4 @@ -package awslogs // import "github.com/docker/docker/daemon/logger/awslogs" +package awslogs import ( "context" diff --git a/daemon/logger/copier.go b/daemon/logger/copier.go index ac9639840e..c85c997e5c 100644 --- a/daemon/logger/copier.go +++ b/daemon/logger/copier.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "bytes" diff --git a/daemon/logger/copier_test.go b/daemon/logger/copier_test.go index 2605919f3c..6c29644879 100644 --- a/daemon/logger/copier_test.go +++ b/daemon/logger/copier_test.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "bytes" diff --git a/daemon/logger/etwlogs/etwlogs_windows.go b/daemon/logger/etwlogs/etwlogs_windows.go index d54f803206..179b6d8bba 100644 --- a/daemon/logger/etwlogs/etwlogs_windows.go +++ b/daemon/logger/etwlogs/etwlogs_windows.go @@ -10,7 +10,7 @@ // // Each container log message generates an ETW event that also contains: // the container name and ID, the timestamp, and the stream type. -package etwlogs // import "github.com/docker/docker/daemon/logger/etwlogs" +package etwlogs import ( "context" diff --git a/daemon/logger/factory.go b/daemon/logger/factory.go index 54f9653963..54e3e4631d 100644 --- a/daemon/logger/factory.go +++ b/daemon/logger/factory.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "fmt" diff --git a/daemon/logger/fluentd/fluentd.go b/daemon/logger/fluentd/fluentd.go index 219977bedb..2bbbab64ef 100644 --- a/daemon/logger/fluentd/fluentd.go +++ b/daemon/logger/fluentd/fluentd.go @@ -1,6 +1,6 @@ // Package fluentd provides the log driver for forwarding server logs // to fluentd endpoints. -package fluentd // import "github.com/docker/docker/daemon/logger/fluentd" +package fluentd import ( "context" diff --git a/daemon/logger/fluentd/fluentd_test.go b/daemon/logger/fluentd/fluentd_test.go index bfc31a1f5f..9725de5594 100644 --- a/daemon/logger/fluentd/fluentd_test.go +++ b/daemon/logger/fluentd/fluentd_test.go @@ -1,4 +1,5 @@ -package fluentd // import "github.com/docker/docker/daemon/logger/fluentd" +package fluentd + import ( "context" "net" diff --git a/daemon/logger/gcplogs/gcplogging.go b/daemon/logger/gcplogs/gcplogging.go index 976e360fd2..0261a0ff60 100644 --- a/daemon/logger/gcplogs/gcplogging.go +++ b/daemon/logger/gcplogs/gcplogging.go @@ -1,4 +1,4 @@ -package gcplogs // import "github.com/docker/docker/daemon/logger/gcplogs" +package gcplogs import ( "context" diff --git a/daemon/logger/gelf/gelf.go b/daemon/logger/gelf/gelf.go index 1bce2e2f2d..bc1d114373 100644 --- a/daemon/logger/gelf/gelf.go +++ b/daemon/logger/gelf/gelf.go @@ -1,6 +1,6 @@ // Package gelf provides the log driver for forwarding server logs to // endpoints that support the Graylog Extended Log Format. -package gelf // import "github.com/docker/docker/daemon/logger/gelf" +package gelf import ( "compress/flate" diff --git a/daemon/logger/gelf/gelf_test.go b/daemon/logger/gelf/gelf_test.go index a8a5b2cb02..22ae0c6420 100644 --- a/daemon/logger/gelf/gelf_test.go +++ b/daemon/logger/gelf/gelf_test.go @@ -1,6 +1,6 @@ //go:build linux -package gelf // import "github.com/docker/docker/daemon/logger/gelf" +package gelf import ( "net" diff --git a/daemon/logger/journald/doc.go b/daemon/logger/journald/doc.go index 27306edb8b..bd6356d19a 100644 --- a/daemon/logger/journald/doc.go +++ b/daemon/logger/journald/doc.go @@ -1,3 +1,3 @@ // Package journald provides the log driver for forwarding server logs // to endpoints that receive the systemd format. -package journald // import "github.com/docker/docker/daemon/logger/journald" +package journald diff --git a/daemon/logger/journald/internal/export/export.go b/daemon/logger/journald/internal/export/export.go index 3de1b5602d..30ac3fe6d7 100644 --- a/daemon/logger/journald/internal/export/export.go +++ b/daemon/logger/journald/internal/export/export.go @@ -1,6 +1,6 @@ // Package export implements a serializer for the systemd Journal Export Format // as documented at https://systemd.io/JOURNAL_EXPORT_FORMATS/ -package export // import "github.com/docker/docker/daemon/logger/journald/internal/export" +package export import ( "encoding/binary" diff --git a/daemon/logger/journald/internal/fake/sender.go b/daemon/logger/journald/internal/fake/sender.go index 5af0178d25..2a47f98b56 100644 --- a/daemon/logger/journald/internal/fake/sender.go +++ b/daemon/logger/journald/internal/fake/sender.go @@ -7,7 +7,7 @@ // The systemd-journal-remote command reads serialized journal entries in the // Journal Export Format and writes them to journal files. This format is // well-documented and straightforward to generate. -package fake // import "github.com/docker/docker/daemon/logger/journald/internal/fake" +package fake import ( "bytes" diff --git a/daemon/logger/journald/internal/sdjournal/doc.go b/daemon/logger/journald/internal/sdjournal/doc.go index 2e0850694d..bbe1589eab 100644 --- a/daemon/logger/journald/internal/sdjournal/doc.go +++ b/daemon/logger/journald/internal/sdjournal/doc.go @@ -1,3 +1,3 @@ // Package sdjournal provides a Go interface to the systemd journal read API by // wrapping the libsystemd C library. -package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal" +package sdjournal diff --git a/daemon/logger/journald/internal/sdjournal/sdjournal.go b/daemon/logger/journald/internal/sdjournal/sdjournal.go index 31adeff7c8..505de174e8 100644 --- a/daemon/logger/journald/internal/sdjournal/sdjournal.go +++ b/daemon/logger/journald/internal/sdjournal/sdjournal.go @@ -1,6 +1,6 @@ //go:build linux && cgo && !static_build && journald -package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal" +package sdjournal // #cgo pkg-config: libsystemd // #include diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go index 3e6e003335..f72ac53bc6 100644 --- a/daemon/logger/journald/journald.go +++ b/daemon/logger/journald/journald.go @@ -1,6 +1,6 @@ //go:build linux -package journald // import "github.com/docker/docker/daemon/logger/journald" +package journald import ( "fmt" diff --git a/daemon/logger/journald/journald_test.go b/daemon/logger/journald/journald_test.go index 6f67357617..020121370f 100644 --- a/daemon/logger/journald/journald_test.go +++ b/daemon/logger/journald/journald_test.go @@ -1,6 +1,6 @@ //go:build linux -package journald // import "github.com/docker/docker/daemon/logger/journald" +package journald import ( "testing" diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go index e514567137..187db6bb60 100644 --- a/daemon/logger/journald/read.go +++ b/daemon/logger/journald/read.go @@ -1,6 +1,6 @@ //go:build linux && cgo && !static_build && journald -package journald // import "github.com/docker/docker/daemon/logger/journald" +package journald import ( "context" diff --git a/daemon/logger/journald/read_test.go b/daemon/logger/journald/read_test.go index 3b17d18309..9448bcfc5f 100644 --- a/daemon/logger/journald/read_test.go +++ b/daemon/logger/journald/read_test.go @@ -1,6 +1,6 @@ //go:build linux && cgo && !static_build && journald -package journald // import "github.com/docker/docker/daemon/logger/journald" +package journald import ( "sync" diff --git a/daemon/logger/jsonfilelog/jsonfilelog.go b/daemon/logger/jsonfilelog/jsonfilelog.go index ae9ad77865..e089ac2fbd 100644 --- a/daemon/logger/jsonfilelog/jsonfilelog.go +++ b/daemon/logger/jsonfilelog/jsonfilelog.go @@ -1,7 +1,7 @@ // Package jsonfilelog provides the default Logger implementation for // Docker logging. This logger logs to files on the host server in the // JSON format. -package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog" +package jsonfilelog import ( "bytes" diff --git a/daemon/logger/jsonfilelog/jsonfilelog_test.go b/daemon/logger/jsonfilelog/jsonfilelog_test.go index 23d13bb24e..24e984905d 100644 --- a/daemon/logger/jsonfilelog/jsonfilelog_test.go +++ b/daemon/logger/jsonfilelog/jsonfilelog_test.go @@ -1,4 +1,4 @@ -package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog" +package jsonfilelog import ( "bytes" diff --git a/daemon/logger/jsonfilelog/jsonlog/jsonlog.go b/daemon/logger/jsonfilelog/jsonlog/jsonlog.go index 050900197f..1caf5e03a2 100644 --- a/daemon/logger/jsonfilelog/jsonlog/jsonlog.go +++ b/daemon/logger/jsonfilelog/jsonlog/jsonlog.go @@ -1,4 +1,4 @@ -package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" +package jsonlog import ( "time" diff --git a/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go index d7e2e37184..9e7717275a 100644 --- a/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go +++ b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go @@ -1,4 +1,4 @@ -package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" +package jsonlog import ( "bytes" diff --git a/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go index 125c2b0576..6db2409d7a 100644 --- a/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go +++ b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go @@ -1,4 +1,4 @@ -package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" +package jsonlog import ( "bytes" diff --git a/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go b/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go index 1822ea5dbc..5fd8023e7c 100644 --- a/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go +++ b/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go @@ -1,4 +1,4 @@ -package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" +package jsonlog import ( "time" diff --git a/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go b/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go index ee2a2709fd..fb868110a6 100644 --- a/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go +++ b/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go @@ -1,4 +1,4 @@ -package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" +package jsonlog import ( "testing" diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go index ff235e6d3d..8f1bfb89e0 100644 --- a/daemon/logger/jsonfilelog/read.go +++ b/daemon/logger/jsonfilelog/read.go @@ -1,4 +1,4 @@ -package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog" +package jsonfilelog import ( "context" diff --git a/daemon/logger/jsonfilelog/read_test.go b/daemon/logger/jsonfilelog/read_test.go index aeed08f430..b25ca16692 100644 --- a/daemon/logger/jsonfilelog/read_test.go +++ b/daemon/logger/jsonfilelog/read_test.go @@ -1,4 +1,4 @@ -package jsonfilelog // import "github.com/docker/docker/daemon/logger/jsonfilelog" +package jsonfilelog import ( "bufio" diff --git a/daemon/logger/local/doc.go b/daemon/logger/local/doc.go index 7b082a3d53..ba9b2a2e07 100644 --- a/daemon/logger/local/doc.go +++ b/daemon/logger/local/doc.go @@ -6,4 +6,4 @@ // backwards (such as is the case when tailing a file) // // Example log message format: [22][This is a log message.][22][28][This is another log message.][28] -package local // import "github.com/docker/docker/daemon/logger/local" +package local diff --git a/daemon/logger/local/local.go b/daemon/logger/local/local.go index 88b4f0da28..bfa5d8e4df 100644 --- a/daemon/logger/local/local.go +++ b/daemon/logger/local/local.go @@ -1,4 +1,4 @@ -package local // import "github.com/docker/docker/daemon/logger/local" +package local import ( "encoding/binary" diff --git a/daemon/logger/logger.go b/daemon/logger/logger.go index 868ac8b168..73e7d2a18d 100644 --- a/daemon/logger/logger.go +++ b/daemon/logger/logger.go @@ -5,7 +5,7 @@ // factory, which holds the contextual instance information that // allows multiple loggers of the same type to perform different // actions, such as logging to different locations. -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/logger_test.go b/daemon/logger/logger_test.go index eaeec24085..bfbd6daafe 100644 --- a/daemon/logger/logger_test.go +++ b/daemon/logger/logger_test.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "github.com/docker/docker/api/types/backend" diff --git a/daemon/logger/loggertest/logreader.go b/daemon/logger/loggertest/logreader.go index 7d064a29c9..955fb80951 100644 --- a/daemon/logger/loggertest/logreader.go +++ b/daemon/logger/loggertest/logreader.go @@ -1,4 +1,4 @@ -package loggertest // import "github.com/docker/docker/daemon/logger/loggertest" +package loggertest import ( "context" diff --git a/daemon/logger/loggerutils/cache/local_cache.go b/daemon/logger/loggerutils/cache/local_cache.go index 8688740713..9dd96e8cc2 100644 --- a/daemon/logger/loggerutils/cache/local_cache.go +++ b/daemon/logger/loggerutils/cache/local_cache.go @@ -1,4 +1,4 @@ -package cache // import "github.com/docker/docker/daemon/logger/loggerutils/cache" +package cache import ( "context" diff --git a/daemon/logger/loggerutils/follow.go b/daemon/logger/loggerutils/follow.go index 7a6b8e50f0..b97edd2d11 100644 --- a/daemon/logger/loggerutils/follow.go +++ b/daemon/logger/loggerutils/follow.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "context" diff --git a/daemon/logger/loggerutils/log_tag.go b/daemon/logger/loggerutils/log_tag.go index 719512dbdb..7c170909a7 100644 --- a/daemon/logger/loggerutils/log_tag.go +++ b/daemon/logger/loggerutils/log_tag.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "bytes" diff --git a/daemon/logger/loggerutils/log_tag_test.go b/daemon/logger/loggerutils/log_tag_test.go index 41957a8b19..1a6d9f1516 100644 --- a/daemon/logger/loggerutils/log_tag_test.go +++ b/daemon/logger/loggerutils/log_tag_test.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "testing" diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go index 886617c3a1..72ab189f66 100644 --- a/daemon/logger/loggerutils/logfile.go +++ b/daemon/logger/loggerutils/logfile.go @@ -1,7 +1,7 @@ // FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16: //go:build go1.23 -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "compress/gzip" diff --git a/daemon/logger/loggerutils/logfile_race_test.go b/daemon/logger/loggerutils/logfile_race_test.go index 3cffeb7be8..4833fa3fae 100644 --- a/daemon/logger/loggerutils/logfile_race_test.go +++ b/daemon/logger/loggerutils/logfile_race_test.go @@ -1,6 +1,6 @@ //go:build race -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "context" diff --git a/daemon/logger/loggerutils/logfile_test.go b/daemon/logger/loggerutils/logfile_test.go index c684e36d1b..462ed45ded 100644 --- a/daemon/logger/loggerutils/logfile_test.go +++ b/daemon/logger/loggerutils/logfile_test.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "bufio" diff --git a/daemon/logger/loggerutils/sharedtemp.go b/daemon/logger/loggerutils/sharedtemp.go index fdf07115b6..5e31ff4f43 100644 --- a/daemon/logger/loggerutils/sharedtemp.go +++ b/daemon/logger/loggerutils/sharedtemp.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "io" diff --git a/daemon/logger/loggerutils/sharedtemp_test.go b/daemon/logger/loggerutils/sharedtemp_test.go index f8c1efe400..57edf28a71 100644 --- a/daemon/logger/loggerutils/sharedtemp_test.go +++ b/daemon/logger/loggerutils/sharedtemp_test.go @@ -1,4 +1,4 @@ -package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils" +package loggerutils import ( "io" diff --git a/daemon/logger/loginfo.go b/daemon/logger/loginfo.go index 4c07a25b4a..08d82ddd02 100644 --- a/daemon/logger/loginfo.go +++ b/daemon/logger/loginfo.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "fmt" diff --git a/daemon/logger/metrics.go b/daemon/logger/metrics.go index 2362c9d714..edeb6110bb 100644 --- a/daemon/logger/metrics.go +++ b/daemon/logger/metrics.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( gometrics "github.com/docker/go-metrics" diff --git a/daemon/logger/plugin.go b/daemon/logger/plugin.go index 7e06fef52d..9004c082b9 100644 --- a/daemon/logger/plugin.go +++ b/daemon/logger/plugin.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "fmt" diff --git a/daemon/logger/plugin_unix.go b/daemon/logger/plugin_unix.go index 1951ca88bd..f5db1d457f 100644 --- a/daemon/logger/plugin_unix.go +++ b/daemon/logger/plugin_unix.go @@ -1,6 +1,6 @@ //go:build linux || freebsd -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/plugin_unsupported.go b/daemon/logger/plugin_unsupported.go index de2d4fb259..087305a67e 100644 --- a/daemon/logger/plugin_unsupported.go +++ b/daemon/logger/plugin_unsupported.go @@ -1,6 +1,6 @@ //go:build !linux && !freebsd -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "errors" diff --git a/daemon/logger/proxy.go b/daemon/logger/proxy.go index 5173c09758..215c4e5107 100644 --- a/daemon/logger/proxy.go +++ b/daemon/logger/proxy.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "errors" diff --git a/daemon/logger/ring.go b/daemon/logger/ring.go index 10b6c13cd8..6a0da010f4 100644 --- a/daemon/logger/ring.go +++ b/daemon/logger/ring.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/ring_test.go b/daemon/logger/ring_test.go index eab2446234..df61315e07 100644 --- a/daemon/logger/ring_test.go +++ b/daemon/logger/ring_test.go @@ -1,4 +1,4 @@ -package logger // import "github.com/docker/docker/daemon/logger" +package logger import ( "context" diff --git a/daemon/logger/splunk/splunk.go b/daemon/logger/splunk/splunk.go index 496917f209..8111ff2d44 100644 --- a/daemon/logger/splunk/splunk.go +++ b/daemon/logger/splunk/splunk.go @@ -1,6 +1,6 @@ // Package splunk provides the log driver for forwarding server logs to // Splunk HTTP Event Collector endpoint. -package splunk // import "github.com/docker/docker/daemon/logger/splunk" +package splunk import ( "bytes" diff --git a/daemon/logger/splunk/splunk_test.go b/daemon/logger/splunk/splunk_test.go index d531cac5a9..854ce7e402 100644 --- a/daemon/logger/splunk/splunk_test.go +++ b/daemon/logger/splunk/splunk_test.go @@ -1,4 +1,4 @@ -package splunk // import "github.com/docker/docker/daemon/logger/splunk" +package splunk import ( "compress/gzip" diff --git a/daemon/logger/splunk/splunkhecmock_test.go b/daemon/logger/splunk/splunkhecmock_test.go index 8fd453f310..a2a09f9ffa 100644 --- a/daemon/logger/splunk/splunkhecmock_test.go +++ b/daemon/logger/splunk/splunkhecmock_test.go @@ -1,4 +1,4 @@ -package splunk // import "github.com/docker/docker/daemon/logger/splunk" +package splunk import ( "compress/gzip" diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go index cd3463964d..d9ab42a462 100644 --- a/daemon/logger/syslog/syslog.go +++ b/daemon/logger/syslog/syslog.go @@ -1,5 +1,5 @@ // Package syslog provides the logdriver for forwarding server logs to syslog endpoints. -package syslog // import "github.com/docker/docker/daemon/logger/syslog" +package syslog import ( "crypto/tls" diff --git a/daemon/logger/syslog/syslog_test.go b/daemon/logger/syslog/syslog_test.go index dbb68f2d7b..7fe8e87450 100644 --- a/daemon/logger/syslog/syslog_test.go +++ b/daemon/logger/syslog/syslog_test.go @@ -1,4 +1,4 @@ -package syslog // import "github.com/docker/docker/daemon/logger/syslog" +package syslog import ( "log" diff --git a/daemon/logger/templates/templates.go b/daemon/logger/templates/templates.go index ca4129ac68..9ca2066329 100644 --- a/daemon/logger/templates/templates.go +++ b/daemon/logger/templates/templates.go @@ -1,4 +1,4 @@ -package templates // import "github.com/docker/docker/daemon/logger/templates" +package templates import ( "bytes" diff --git a/daemon/logger/templates/templates_test.go b/daemon/logger/templates/templates_test.go index 2f8fad10d0..583cc2b07f 100644 --- a/daemon/logger/templates/templates_test.go +++ b/daemon/logger/templates/templates_test.go @@ -1,4 +1,4 @@ -package templates // import "github.com/docker/docker/daemon/logger/templates" +package templates import ( "bytes"