From 5158e66f77cc2bfccf55d5e866be8a19b38ed9a8 Mon Sep 17 00:00:00 2001 From: Halvard Skogsrud Date: Wed, 11 Aug 2021 20:23:26 +1000 Subject: [PATCH] Fix lint errors for TODO comments in import block Adding the TODO in the import block resulted in gci linter errors: https://app.travis-ci.com/github/GoogleContainerTools/skaffold/jobs/530642848#L313 --- pkg/skaffold/build/ko/build.go | 6 +++--- pkg/skaffold/build/ko/build_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/skaffold/build/ko/build.go b/pkg/skaffold/build/ko/build.go index a7454dbc892..632e50bfcfa 100644 --- a/pkg/skaffold/build/ko/build.go +++ b/pkg/skaffold/build/ko/build.go @@ -16,6 +16,9 @@ limitations under the License. package ko +// TODO(halvards)[08/11/2021]: Replace the latestV1 import path with the +// real schema import path once the contents of ./schema has been added to +// the real schema in pkg/skaffold/schema/latest/v1. import ( "context" "fmt" @@ -26,9 +29,6 @@ import ( "github.com/google/ko/pkg/build" "github.com/google/ko/pkg/publish" - // TODO(halvards)[08/11/2021]: Replace the latestV1 import path with the - // real schema import path once the contents of ./schema has been added to - // the real schema in pkg/skaffold/schema/latest/v1. // latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1" latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/ko/schema" ) diff --git a/pkg/skaffold/build/ko/build_test.go b/pkg/skaffold/build/ko/build_test.go index bdac5c5bcb7..e4b36fa3fec 100644 --- a/pkg/skaffold/build/ko/build_test.go +++ b/pkg/skaffold/build/ko/build_test.go @@ -16,6 +16,9 @@ limitations under the License. package ko +// TODO(halvards)[08/11/2021]: Replace the latestV1 import path with the +// real schema import path once the contents of ./schema has been added to +// the real schema in pkg/skaffold/schema/latest/v1. import ( "bytes" "context" @@ -27,9 +30,6 @@ import ( "github.com/google/ko/pkg/build" "github.com/google/ko/pkg/publish" - // TODO(halvards)[08/11/2021]: Replace the latestV1 import path with the - // real schema import path once the contents of ./schema has been added to - // the real schema in pkg/skaffold/schema/latest/v1. // latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1" latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/ko/schema" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"