Skip to content

Commit

Permalink
Updates, latest conflicts and formatting
Browse files Browse the repository at this point in the history 
Signed-off-by: Matthias Wessendorf <[email protected]>
  • Loading branch information
@matzew
matzew committed Nov 13, 2024
1 parent 6e6be0b commit 44151ad
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 24 deletions.
5 changes: 3 additions & 2 deletions cmd/controller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ import (
// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

"errors"
integrationSink "knative.dev/eventing/pkg/reconciler/integration/sink"
integrationSource "knative.dev/eventing/pkg/reconciler/integration/source"
"log"
"net/http"
"os"
"time"

integrationSink "knative.dev/eventing/pkg/reconciler/integration/sink"
integrationSource "knative.dev/eventing/pkg/reconciler/integration/source"

"knative.dev/pkg/injection/sharedmain"

filteredFactory "knative.dev/pkg/client/injection/kube/informers/factory/filtered"
Expand Down
6 changes: 3 additions & 3 deletions docs/eventing-api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6055,7 +6055,7 @@ JobSinkStatus
<td>
<code>s3</code><br/>
<em>
knative.dev/eventing/pkg/apis/common.AWSS3
knative.dev/eventing/pkg/apis/common/integration/v1alpha1.AWSS3
</em>
</td>
<td>
Expand All @@ -6065,7 +6065,7 @@ knative.dev/eventing/pkg/apis/common.AWSS3
<td>
<code>sqs</code><br/>
<em>
knative.dev/eventing/pkg/apis/common.AWSSQS
knative.dev/eventing/pkg/apis/common/integration/v1alpha1.AWSSQS
</em>
</td>
<td>
Expand All @@ -6076,7 +6076,7 @@ knative.dev/eventing/pkg/apis/common.AWSSQS
<td>
<code>auth</code><br/>
<em>
knative.dev/eventing/pkg/apis/common.Auth
knative.dev/eventing/pkg/apis/common/integration/v1alpha1.Auth
</em>
</td>
<td>
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/sinks/v1alpha1/integration_sink_defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ package v1alpha1

import (
"context"
"github.com/google/go-cmp/cmp"
"testing"

"github.com/google/go-cmp/cmp"
)

func TestIntegrationSinkSetDefaults(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/sinks/v1alpha1/integration_sink_lifecycle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ limitations under the License.
package v1alpha1

import (
"testing"

"github.com/google/go-cmp/cmp"
corev1 "k8s.io/api/core/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
"testing"
)

func TestIntegrationSinkGetConditionSet(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/sinks/v1alpha1/integration_sink_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"knative.dev/eventing/pkg/apis/common"
"knative.dev/eventing/pkg/apis/common/integration/v1alpha1"
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
"knative.dev/pkg/apis"
duckv1 "knative.dev/pkg/apis/duck/v1"
Expand Down Expand Up @@ -74,9 +74,9 @@ type Log struct {
}

type Aws struct {
S3 *common.AWSS3 `json:"s3,omitempty"` // S3 source configuration
SQS *common.AWSSQS `json:"sqs,omitempty"` // SQS source configuration
Auth *common.Auth `json:"auth,omitempty"`
S3 *v1alpha1.AWSS3 `json:"s3,omitempty"` // S3 source configuration
SQS *v1alpha1.AWSSQS `json:"sqs,omitempty"` // SQS source configuration
Auth *v1alpha1.Auth `json:"auth,omitempty"`
}

type IntegrationSinkStatus struct {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/sinks/v1alpha1/integration_sink_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ limitations under the License.
package v1alpha1

import (
"knative.dev/eventing/pkg/apis/common"
"testing"

"knative.dev/eventing/pkg/apis/common"

Check failure on line 22 in pkg/apis/sinks/v1alpha1/integration_sink_types_test.go

View workflow job for this annotation

GitHub Actions / build / Build 

cannot find module providing package knative.dev/eventing/pkg/apis/common: import lookup disabled by -mod=vendor

Check failure on line 22 in pkg/apis/sinks/v1alpha1/integration_sink_types_test.go

View workflow job for this annotation

GitHub Actions / test / Unit Tests 

cannot find module providing package knative.dev/eventing/pkg/apis/common: import lookup disabled by -mod=vendor
)

func TestIntegrationSink_GetStatus(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/sinks/v1alpha1/integration_sink_validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package v1alpha1

import (
"context"

"knative.dev/pkg/apis"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/sinks/v1alpha1/integration_sink_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package v1alpha1

import (
"context"
"knative.dev/eventing/pkg/apis/common"
"testing"

"knative.dev/eventing/pkg/apis/common"

"github.com/google/go-cmp/cmp"
"knative.dev/pkg/apis"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/sinks/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/apis/sources/v1alpha1/integration_types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/sources/v1alpha1/integration_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/reconciler/integration/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package integration

import (
"fmt"
corev1 "k8s.io/api/core/v1"
"reflect"
"strconv"
"strings"

corev1 "k8s.io/api/core/v1"
)

const prefix = "CAMEL_KAMELET_"
Expand Down
3 changes: 2 additions & 1 deletion pkg/reconciler/integration/helper_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package integration

Check failure on line 1 in pkg/reconciler/integration/helper_test.go

View workflow job for this annotation

GitHub Actions / style / Golang / Boilerplate Check (go) 

[Go headers] reported by reviewdog 🐶
missing boilerplate:

Raw Output:
pkg/reconciler/integration/helper_test.go:1: missing boilerplate:
/*
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

	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.
*/

import (
"testing"

"github.com/google/go-cmp/cmp"
corev1 "k8s.io/api/core/v1"
"testing"
)

func TestGenerateEnvVarsFromStruct(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions pkg/reconciler/integration/sink/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sink

import (
"context"

"k8s.io/client-go/tools/cache"
"knative.dev/eventing/pkg/apis/feature"
v1alpha1 "knative.dev/eventing/pkg/apis/sinks/v1alpha1"

Check failure on line 8 in pkg/reconciler/integration/sink/controller.go

View workflow job for this annotation

GitHub Actions / style / Golang / Lint 

could not import knative.dev/eventing/pkg/apis/sinks/v1alpha1 (-: # knative.dev/eventing/pkg/apis/sinks/v1alpha1
Expand Down
1 change: 1 addition & 0 deletions pkg/reconciler/integration/sink/integrationsink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package sink
import (
"context"
"fmt"

"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
3 changes: 2 additions & 1 deletion test/rekt/features/integrationsink/features.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ limitations under the License.
package integrationsink

import (
"time"

cetest "github.com/cloudevents/sdk-go/v2/test"
"github.com/google/uuid"
"knative.dev/eventing/test/rekt/features/featureflags"
Expand All @@ -25,7 +27,6 @@ import (
"knative.dev/reconciler-test/pkg/eventshub"
"knative.dev/reconciler-test/pkg/eventshub/assert"
"knative.dev/reconciler-test/pkg/feature"
"time"
)

func Success() *feature.Feature {
Expand Down
3 changes: 2 additions & 1 deletion test/rekt/integration_sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ limitations under the License.
package rekt

import (
"testing"

"knative.dev/eventing/test/rekt/features/integrationsink"
"knative.dev/reconciler-test/pkg/eventshub"
"testing"

"knative.dev/pkg/system"
"knative.dev/reconciler-test/pkg/environment"
Expand Down
3 changes: 2 additions & 1 deletion test/rekt/resources/integrationsink/integrationsink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ package integrationsink
import (
"context"
"embed"
"time"

"k8s.io/apimachinery/pkg/runtime/schema"
"knative.dev/reconciler-test/pkg/environment"
"knative.dev/reconciler-test/pkg/eventshub"
"knative.dev/reconciler-test/pkg/feature"
"knative.dev/reconciler-test/pkg/k8s"
"knative.dev/reconciler-test/pkg/knative"
"knative.dev/reconciler-test/pkg/manifest"
"time"
)

//go:embed integrationsink.yaml
Expand Down

0 comments on commit 44151ad

Please sign in to comment.