diff --git a/pkg/interceptors/bitbucket/bitbucket_test.go b/pkg/interceptors/bitbucket/bitbucket_test.go index c32c28dbd..749ecd8a2 100644 --- a/pkg/interceptors/bitbucket/bitbucket_test.go +++ b/pkg/interceptors/bitbucket/bitbucket_test.go @@ -24,12 +24,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - - "github.com/tektoncd/pipeline/pkg/logging" triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake" + "knative.dev/pkg/logging" rtesting "knative.dev/pkg/reconciler/testing" ) diff --git a/pkg/interceptors/cel/cel_test.go b/pkg/interceptors/cel/cel_test.go index 2fd9b0457..0116a0799 100644 --- a/pkg/interceptors/cel/cel_test.go +++ b/pkg/interceptors/cel/cel_test.go @@ -31,13 +31,12 @@ import ( "github.com/google/cel-go/common/types" "github.com/google/cel-go/common/types/ref" "github.com/google/go-cmp/cmp" - "github.com/tektoncd/pipeline/pkg/logging" + triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake" + "knative.dev/pkg/logging" rtesting "knative.dev/pkg/reconciler/testing" - - triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" ) const testNS = "testing-ns" diff --git a/pkg/interceptors/github/github_test.go b/pkg/interceptors/github/github_test.go index 7e522b7ed..b195cad35 100644 --- a/pkg/interceptors/github/github_test.go +++ b/pkg/interceptors/github/github_test.go @@ -24,12 +24,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - - "github.com/tektoncd/pipeline/pkg/logging" triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake" + "knative.dev/pkg/logging" rtesting "knative.dev/pkg/reconciler/testing" ) diff --git a/pkg/interceptors/gitlab/gitlab_test.go b/pkg/interceptors/gitlab/gitlab_test.go index 4dbe49858..eadc6c9fb 100644 --- a/pkg/interceptors/gitlab/gitlab_test.go +++ b/pkg/interceptors/gitlab/gitlab_test.go @@ -23,12 +23,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - - "github.com/tektoncd/pipeline/pkg/logging" triggersv1 "github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake" + "knative.dev/pkg/logging" rtesting "knative.dev/pkg/reconciler/testing" ) diff --git a/vendor/github.com/tektoncd/pipeline/pkg/logging/config.go b/vendor/github.com/tektoncd/pipeline/pkg/logging/config.go deleted file mode 100644 index 67cb1a6e4..000000000 --- a/vendor/github.com/tektoncd/pipeline/pkg/logging/config.go +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2019 The Tekton 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 logging - -import ( - "go.uber.org/zap" - - "knative.dev/pkg/logging" -) - -const ( - // ConfigName is the name of the ConfigMap that the logging config will be stored in - ConfigName = "config-logging" -) - -// NewLogger creates a logger with the supplied configuration. -// In addition to the logger, it returns AtomicLevel that can -// be used to change the logging level at runtime. -// If configuration is empty, a fallback configuration is used. -// If configuration cannot be used to instantiate a logger, -// the same fallback configuration is used. -func NewLogger(configJSON string, levelOverride string) (*zap.SugaredLogger, zap.AtomicLevel) { - return logging.NewLogger(configJSON, levelOverride) -} - -// NewLoggerFromConfig creates a logger using the provided Config -func NewLoggerFromConfig(config *logging.Config, name string) (*zap.SugaredLogger, zap.AtomicLevel) { - return logging.NewLoggerFromConfig(config, name) -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 631123486..d661c5025 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -279,7 +279,6 @@ github.com/tektoncd/pipeline/pkg/client/resource/injection/client github.com/tektoncd/pipeline/pkg/client/resource/injection/client/fake github.com/tektoncd/pipeline/pkg/contexts github.com/tektoncd/pipeline/pkg/list -github.com/tektoncd/pipeline/pkg/logging github.com/tektoncd/pipeline/pkg/names github.com/tektoncd/pipeline/pkg/reconciler/pipeline/dag github.com/tektoncd/pipeline/pkg/substitution