From b91b16411c0077c95b35a18871652d8cad499997 Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 19 Nov 2024 11:46:07 +0100 Subject: [PATCH] :lipstick: improve formatting... Signed-off-by: Matthias Wessendorf --- cmd/controller/main.go | 3 ++- .../v1alpha1/integration_types_test.go | 3 ++- .../v1alpha1/integration_validation_test.go | 3 ++- pkg/reconciler/integration/helper.go | 2 -- .../integration/source/integrationsource.go | 1 + .../source/resources/containersource.go | 20 +++++++++---------- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 68d19d50f49..e8cbe895745 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -21,12 +21,13 @@ import ( // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "errors" - "knative.dev/eventing/pkg/reconciler/integration/source" "log" "net/http" "os" "time" + "knative.dev/eventing/pkg/reconciler/integration/source" + "knative.dev/pkg/injection/sharedmain" filteredFactory "knative.dev/pkg/client/injection/kube/informers/factory/filtered" diff --git a/pkg/apis/sources/v1alpha1/integration_types_test.go b/pkg/apis/sources/v1alpha1/integration_types_test.go index 4dfd20ea801..ad30b14e2ed 100644 --- a/pkg/apis/sources/v1alpha1/integration_types_test.go +++ b/pkg/apis/sources/v1alpha1/integration_types_test.go @@ -17,8 +17,9 @@ limitations under the License. package v1alpha1 import ( - "knative.dev/eventing/pkg/apis/common/integration/v1alpha1" "testing" + + "knative.dev/eventing/pkg/apis/common/integration/v1alpha1" ) func TestIntegrationSource_GetStatus(t *testing.T) { diff --git a/pkg/apis/sources/v1alpha1/integration_validation_test.go b/pkg/apis/sources/v1alpha1/integration_validation_test.go index 3281b3940fb..9b263426b61 100644 --- a/pkg/apis/sources/v1alpha1/integration_validation_test.go +++ b/pkg/apis/sources/v1alpha1/integration_validation_test.go @@ -18,9 +18,10 @@ package v1alpha1 import ( "context" - "knative.dev/eventing/pkg/apis/common/integration/v1alpha1" "testing" + "knative.dev/eventing/pkg/apis/common/integration/v1alpha1" + "github.com/google/go-cmp/cmp" "knative.dev/pkg/apis" ) diff --git a/pkg/reconciler/integration/helper.go b/pkg/reconciler/integration/helper.go index d77cc576340..028dacb007b 100644 --- a/pkg/reconciler/integration/helper.go +++ b/pkg/reconciler/integration/helper.go @@ -25,8 +25,6 @@ import ( corev1 "k8s.io/api/core/v1" ) -const prefix = "CAMEL_KAMELET_" - func GenerateEnvVarsFromStruct(prefix string, s interface{}) []corev1.EnvVar { var envVars []corev1.EnvVar diff --git a/pkg/reconciler/integration/source/integrationsource.go b/pkg/reconciler/integration/source/integrationsource.go index c466058b4bc..ef94fd2fc89 100644 --- a/pkg/reconciler/integration/source/integrationsource.go +++ b/pkg/reconciler/integration/source/integrationsource.go @@ -19,6 +19,7 @@ package source import ( "context" "fmt" + "knative.dev/eventing/pkg/reconciler/integration/source/resources" "go.uber.org/zap" diff --git a/pkg/reconciler/integration/source/resources/containersource.go b/pkg/reconciler/integration/source/resources/containersource.go index 8607867a6f2..bdf9c510f25 100644 --- a/pkg/reconciler/integration/source/resources/containersource.go +++ b/pkg/reconciler/integration/source/resources/containersource.go @@ -1,17 +1,17 @@ /* - Copyright 2024 The Knative Authors +Copyright 2024 The Knative 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 +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 + 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. +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 resources