Run gofmt 1.19

Signed-off-by: Maksym Pavlenko <[email protected]>

cmd/ctr/commands/cni.go

@@ -36,7 +36,7 @@ const (
 	CtrCniMetadataExtension = "ctr.cni-containerd.metadata"
 )
 
-//ctr pass cni network metadata to containerd if ctr run use option of --cni
+// ctr pass cni network metadata to containerd if ctr run use option of --cni
 type NetworkMetaData struct {
 	EnableCni bool
 }

content/local/store.go

@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/containerd/log"
 	"github.com/sirupsen/logrus"
 
-	digest "github.com/opencontainers/go-digest"
+	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
@@ -643,7 +643,6 @@ func (s *store) ingestRoot(ref string) string {
 // - root: entire ingest directory
 // - ref: name of the starting ref, must be unique
 // - data: file where data is written
-//
 func (s *store) ingestPaths(ref string) (string, string, string) {
 	var (
 		fp = s.ingestRoot(ref)

contrib/fuzz/daemon.go

@@ -2,16 +2,18 @@
 // +build gofuzz
 
 /*
-   Copyright The containerd Authors.
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Copyright The containerd Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 package fuzz
 

filters/filter.go

@@ -65,7 +65,6 @@
 // ```
 // name==foo,labels.bar
 // ```
-//
 package filters
 
 import (

filters/parser.go

@@ -45,7 +45,6 @@ field     := quoted | [A-Za-z] [A-Za-z0-9_]+
 operator  := "==" | "!=" | "~="
 value     := quoted | [^\s,]+
 quoted    := <go string syntax>
-
 */
 func Parse(s string) (Filter, error) {
 	// special case empty to match all

filters/quote.go

@@ -31,10 +31,10 @@ var errQuoteSyntax = errors.New("quote syntax error")
 // or character literal represented by the string s.
 // It returns four values:
 //
-//	1) value, the decoded Unicode code point or byte value;
-//	2) multibyte, a boolean indicating whether the decoded character requires a multibyte UTF-8 representation;
-//	3) tail, the remainder of the string after the character; and
-//	4) an error that will be nil if the character is syntactically valid.
+//  1. value, the decoded Unicode code point or byte value;
+//  2. multibyte, a boolean indicating whether the decoded character requires a multibyte UTF-8 representation;
+//  3. tail, the remainder of the string after the character; and
+//  4. an error that will be nil if the character is syntactically valid.
 //
 // The second argument, quote, specifies the type of literal being parsed
 // and therefore which escaped quote character is permitted.

images/archive/importer.go

@@ -55,12 +55,12 @@ func WithImportCompression() ImportOpt {
 }
 
 // ImportIndex imports an index from a tar archive image bundle
-// - implements Docker v1.1, v1.2 and OCI v1.
-// - prefers OCI v1 when provided
-// - creates OCI index for Docker formats
-// - normalizes Docker references and adds as OCI ref name
-//      e.g. alpine:latest -> docker.io/library/alpine:latest
-// - existing OCI reference names are untouched
+//   - implements Docker v1.1, v1.2 and OCI v1.
+//   - prefers OCI v1 when provided
+//   - creates OCI index for Docker formats
+//   - normalizes Docker references and adds as OCI ref name
+//     e.g. alpine:latest -> docker.io/library/alpine:latest
+//   - existing OCI reference names are untouched
 func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opts ...ImportOpt) (ocispec.Descriptor, error) {
 	var (
 		tr = tar.NewReader(reader)

integration/failpoint/cmd/cni-bridge-fp/main_linux.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -168,7 +168,7 @@ func (c *failpointControl) updateTx(updateFn func(conf *failpointConf) error) er
 	}
 	defer unflock(f.Fd())
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return fmt.Errorf("failed to read failpoint setting %s: %w", c.confPath, err)
 	}

integration/image_pull_timeout_test.go

@@ -64,7 +64,7 @@ func TestCRIImagePullTimeout(t *testing.T) {
 
 // testCRIImagePullTimeoutByHoldingContentOpenWriter tests that
 //
-//  It should not cancel if there is no active http requests.
+//	It should not cancel if there is no active http requests.
 //
 // When there are several pulling requests for the same blob content, there
 // will only one active http request. It is singleflight. For the waiting pulling
@@ -197,7 +197,7 @@ func testCRIImagePullTimeoutByHoldingContentOpenWriter(t *testing.T) {
 
 // testCRIImagePullTimeoutByNoDataTransferred tests that
 //
-//   It should fail because there is no data transferred in open http request.
+//	It should fail because there is no data transferred in open http request.
 //
 // The case uses the local mirror registry to forward request with circuit
 // breaker. If the local registry has transferred a certain amount of data in

metadata/buckets.go

@@ -26,7 +26,7 @@
 //
 // Generically, we try to do the following:
 //
-// 	<version>/<namespace>/<object>/<key> -> <field>
+//	<version>/<namespace>/<object>/<key> -> <field>
 //
 // version: Currently, this is "v1". Additions can be made to v1 in a backwards
 // compatible way. If the layout changes, a new version must be made, along
@@ -46,77 +46,80 @@
 // the structure is changed in addition to adding a migration and incrementing
 // the database version.
 // Notes:
-//  * `╘══*...*` refers to maps with arbitrary keys
-//  * `version` is a key to a numeric value identifying the minor revisions
-//    of schema version
-//  * a namespace in a schema bucket cannot be named "version"
 //
-//  └──v1                                        - Schema version bucket
+//   - `╘══*...*` refers to maps with arbitrary keys
+//
+//   - `version` is a key to a numeric value identifying the minor revisions
+//     of schema version
+//
+//   - a namespace in a schema bucket cannot be named "version"
+//
+//     └──v1                                        - Schema version bucket
 //     ├──version : <varint>                     - Latest version, see migrations
 //     ╘══*namespace*
-//        ├──labels
-//        │  ╘══*key* : <string>                 - Label value
-//        ├──image
-//        │  ╘══*image name*
-//        │     ├──createdat : <binary time>     - Created at
-//        │     ├──updatedat : <binary time>     - Updated at
-//        │     ├──target
-//        │     │  ├──digest : <digest>          - Descriptor digest
-//        │     │  ├──mediatype : <string>       - Descriptor media type
-//        │     │  └──size : <varint>            - Descriptor size
-//        │     └──labels
-//        │        ╘══*key* : <string>           - Label value
-//        ├──containers
-//        │  ╘══*container id*
-//        │     ├──createdat : <binary time>     - Created at
-//        │     ├──updatedat : <binary time>     - Updated at
-//        │     ├──spec : <binary>               - Proto marshaled spec
-//        │     ├──image : <string>              - Image name
-//        │     ├──snapshotter : <string>        - Snapshotter name
-//        │     ├──snapshotKey : <string>        - Snapshot key
-//        │     ├──runtime
-//        │     │  ├──name : <string>            - Runtime name
-//        │     │  ├──extensions
-//        │     │  │  ╘══*name* : <binary>       - Proto marshaled extension
-//        │     │  └──options : <binary>         - Proto marshaled options
-//        │     └──labels
-//        │        ╘══*key* : <string>           - Label value
-//        ├──snapshots
-//        │  ╘══*snapshotter*
-//        │     ╘══*snapshot key*
-//        │        ├──name : <string>            - Snapshot name in backend
-//        │        ├──createdat : <binary time>  - Created at
-//        │        ├──updatedat : <binary time>  - Updated at
-//        │        ├──parent : <string>          - Parent snapshot name
-//        │        ├──children
-//        │        │  ╘══*snapshot key* : <nil>  - Child snapshot reference
-//        │        └──labels
-//        │           ╘══*key* : <string>        - Label value
-//        ├──content
-//        │  ├──blob
-//        │  │  ╘══*blob digest*
-//        │  │     ├──createdat : <binary time>  - Created at
-//        │  │     ├──updatedat : <binary time>  - Updated at
-//        │  │     ├──size : <varint>            - Blob size
-//        │  │     └──labels
-//        │  │        ╘══*key* : <string>        - Label value
-//        │  └──ingests
-//        │     ╘══*ingest reference*
-//        │        ├──ref : <string>             - Ingest reference in backend
-//        │        ├──expireat : <binary time>   - Time to expire ingest
-//        │        └──expected : <digest>        - Expected commit digest
-//        └──leases
-//           ╘══*lease id*
-//              ├──createdat : <binary time>     - Created at
-//              ├──labels
-//              │  ╘══*key* : <string>           - Label value
-//              ├──snapshots
-//              │  ╘══*snapshotter*
-//              │     ╘══*snapshot key* : <nil>  - Snapshot reference
-//              ├──content
-//              │  ╘══*blob digest* : <nil>      - Content blob reference
-//              └──ingests
-//                 ╘══*ingest reference* : <nil> - Content ingest reference
+//     ├──labels
+//     │  ╘══*key* : <string>                 - Label value
+//     ├──image
+//     │  ╘══*image name*
+//     │     ├──createdat : <binary time>     - Created at
+//     │     ├──updatedat : <binary time>     - Updated at
+//     │     ├──target
+//     │     │  ├──digest : <digest>          - Descriptor digest
+//     │     │  ├──mediatype : <string>       - Descriptor media type
+//     │     │  └──size : <varint>            - Descriptor size
+//     │     └──labels
+//     │        ╘══*key* : <string>           - Label value
+//     ├──containers
+//     │  ╘══*container id*
+//     │     ├──createdat : <binary time>     - Created at
+//     │     ├──updatedat : <binary time>     - Updated at
+//     │     ├──spec : <binary>               - Proto marshaled spec
+//     │     ├──image : <string>              - Image name
+//     │     ├──snapshotter : <string>        - Snapshotter name
+//     │     ├──snapshotKey : <string>        - Snapshot key
+//     │     ├──runtime
+//     │     │  ├──name : <string>            - Runtime name
+//     │     │  ├──extensions
+//     │     │  │  ╘══*name* : <binary>       - Proto marshaled extension
+//     │     │  └──options : <binary>         - Proto marshaled options
+//     │     └──labels
+//     │        ╘══*key* : <string>           - Label value
+//     ├──snapshots
+//     │  ╘══*snapshotter*
+//     │     ╘══*snapshot key*
+//     │        ├──name : <string>            - Snapshot name in backend
+//     │        ├──createdat : <binary time>  - Created at
+//     │        ├──updatedat : <binary time>  - Updated at
+//     │        ├──parent : <string>          - Parent snapshot name
+//     │        ├──children
+//     │        │  ╘══*snapshot key* : <nil>  - Child snapshot reference
+//     │        └──labels
+//     │           ╘══*key* : <string>        - Label value
+//     ├──content
+//     │  ├──blob
+//     │  │  ╘══*blob digest*
+//     │  │     ├──createdat : <binary time>  - Created at
+//     │  │     ├──updatedat : <binary time>  - Updated at
+//     │  │     ├──size : <varint>            - Blob size
+//     │  │     └──labels
+//     │  │        ╘══*key* : <string>        - Label value
+//     │  └──ingests
+//     │     ╘══*ingest reference*
+//     │        ├──ref : <string>             - Ingest reference in backend
+//     │        ├──expireat : <binary time>   - Time to expire ingest
+//     │        └──expected : <digest>        - Expected commit digest
+//     └──leases
+//     ╘══*lease id*
+//     ├──createdat : <binary time>     - Created at
+//     ├──labels
+//     │  ╘══*key* : <string>           - Label value
+//     ├──snapshots
+//     │  ╘══*snapshotter*
+//     │     ╘══*snapshot key* : <nil>  - Snapshot reference
+//     ├──content
+//     │  ╘══*blob digest* : <nil>      - Content blob reference
+//     └──ingests
+//     ╘══*ingest reference* : <nil> - Content ingest reference
 package metadata
 
 import (

metadata/db.go

@@ -274,11 +274,11 @@ func (m *DB) RegisterMutationCallback(fn func(bool)) {
 // to be tracked by go away after reboot or process restart.
 //
 // A few limitations to consider:
-// - Collectible Resources cannot reference other resources.
-// - A failure to complete collection will not fail the garbage collection,
-//   however, the resources can be collected in a later run.
-// - Collectible Resources must track whether the resource is active and/or
-//   lease membership.
+//   - Collectible Resources cannot reference other resources.
+//   - A failure to complete collection will not fail the garbage collection,
+//     however, the resources can be collected in a later run.
+//   - Collectible Resources must track whether the resource is active and/or
+//     lease membership.
 func (m *DB) RegisterCollectibleResource(t gc.ResourceType, c Collector) {
 	if t < resourceEnd {
 		panic("cannot re-register metadata resource")

namespaces/store.go

@@ -24,8 +24,6 @@ import "context"
 // oriented. A namespace is really just a name and a set of labels. Objects
 // that belong to a namespace are returned when the namespace is assigned to a
 // given context.
-//
-//
 type Store interface {
 	Create(ctx context.Context, namespace string, labels map[string]string) error
 	Labels(ctx context.Context, namespace string) (map[string]string, error)

oci/spec_opts.go

@@ -591,7 +591,8 @@ func WithNamespacedCgroup() SpecOpts {
 
 // WithUser sets the user to be used within the container.
 // It accepts a valid user string in OCI Image Spec v1.0.0:
-//   user, uid, user:group, uid:gid, uid:group, user:gid
+//
+//	user, uid, user:group, uid:gid, uid:group, user:gid
 func WithUser(userstr string) SpecOpts {
 	return func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 		setProcess(s)

oci/spec_opts_nonlinux.go

@@ -28,27 +28,27 @@ import (
 
 // WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process.
 // The capability set may differ from WithAllKnownCapabilities when running in a container.
-//nolint: deadcode, unused
+// nolint: deadcode, unused
 var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 	return WithCapabilities(nil)(ctx, client, c, s)
 }
 
 // WithAllKnownCapabilities sets all the the known linux capabilities for the container process
-//nolint: deadcode, unused
+// nolint: deadcode, unused
 var WithAllKnownCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error {
 	return WithCapabilities(nil)(ctx, client, c, s)
 }
 
 // WithBlockIO sets the container's blkio parameters
-//nolint: deadcode, unused
+// nolint: deadcode, unused
 func WithBlockIO(blockio interface{}) SpecOpts {
 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 		return errors.New("blkio not supported")
 	}
 }
 
 // WithCPUShares sets the container's cpu shares
-//nolint: deadcode, unused
+// nolint: deadcode, unused
 func WithCPUShares(shares uint64) SpecOpts {
 	return func(ctx context.Context, _ Client, c *containers.Container, s *Spec) error {
 		return nil

pkg/apparmor/apparmor.go

@@ -18,10 +18,11 @@ package apparmor
 
 // HostSupports returns true if apparmor is enabled for the host, // On non-Linux returns false
 // On Linux returns true if apparmor_parser is enabled, and if we
-//  are not running docker-in-docker.
 //
-//  It is a modified version of libcontainer/apparmor.IsEnabled(), which does not
-//  check for apparmor_parser to be present, or if we're running docker-in-docker.
+//	are not running docker-in-docker.
+//
+//	It is a modified version of libcontainer/apparmor.IsEnabled(), which does not
+//	check for apparmor_parser to be present, or if we're running docker-in-docker.
 func HostSupports() bool {
 	return hostSupports()
 }

pkg/cri/opts/spec.go

@@ -77,7 +77,8 @@ func WithProcessArgs(config *runtime.ContainerConfig, image *imagespec.ImageConf
 
 // mounts defines how to sort runtime.Mount.
 // This is the same with the Docker implementation:
-//   https://github.com/moby/moby/blob/17.05.x/daemon/volumes.go#L26
+//
+//	https://github.com/moby/moby/blob/17.05.x/daemon/volumes.go#L26
 type orderedMounts []*runtime.Mount
 
 // Len returns the number of mounts. Used in sorting.