From 97563d8f28f547a3ef9cf42f1a63612d4a6fb931 Mon Sep 17 00:00:00 2001 From: ivantenevvasilev <48180084+ivantenevvasilev@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:51:35 +0200 Subject: [PATCH] Generate images for component that do not have prod versions for release (#3699) * revert versions * generate new images * bump director version --- chart/compass/values.yaml | 4 ++-- components/instance-creator/go.mod | 2 +- components/instance-creator/go.sum | 2 ++ .../client/automock/external_svc_caller.go | 14 ++++++++++---- components/pairing-adapter/go.mod | 2 +- components/pairing-adapter/go.sum | 2 ++ .../internal/adapter/automock/HTTPDoer.go | 19 ++++++++++++++++++- 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml index 8c5d678e56..1d29cda1ef 100644 --- a/chart/compass/values.yaml +++ b/chart/compass/values.yaml @@ -170,7 +170,7 @@ global: name: compass-connectivity-adapter pairing_adapter: dir: dev/incubator/ - version: "PR-3680" + version: "PR-3699" name: compass-pairing-adapter director: dir: dev/incubator/ @@ -190,7 +190,7 @@ global: name: compass-kyma-adapter instance_creator: dir: dev/incubator/ - version: "PR-3680" + version: "PR-3699" name: compass-instance-creator default_tenant_mapping_handler: dir: dev/incubator/ diff --git a/components/instance-creator/go.mod b/components/instance-creator/go.mod index a3d5a08f2b..5ef59775d9 100644 --- a/components/instance-creator/go.mod +++ b/components/instance-creator/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/uuid v1.3.1 github.com/gorilla/mux v1.8.0 github.com/jmoiron/sqlx v1.3.5 - github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8 + github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937 github.com/kyma-incubator/compass/components/hydrator v0.0.0-20240228074947-02a81b1e3bf8 github.com/lib/pq v1.10.9 github.com/pkg/errors v0.9.1 diff --git a/components/instance-creator/go.sum b/components/instance-creator/go.sum index 82d666283f..914639aab1 100644 --- a/components/instance-creator/go.sum +++ b/components/instance-creator/go.sum @@ -146,6 +146,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8 h1:ZnKp4kFSCTrot/02j+BrLvqeFbBXo448hgtWm+knZ/I= github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8/go.mod h1:WG/lUocX9lA2E3LPaI7Oqm8RZDmB46+jtft2SC0ScVY= +github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937 h1:Xl/jHKo5vduKaBjl9Viy6HkfOP2i70tqUgfx9cnEcuc= +github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937/go.mod h1:m2uughFQ1t+J24NGz5N3E87n6HHmT+qzsXlpzxHnjKY= github.com/kyma-incubator/compass/components/hydrator v0.0.0-20240228074947-02a81b1e3bf8 h1:Ig4/5zfGADb7oCL6YQ4ZkHs4WADhPDYX+NcRWBPNxL4= github.com/kyma-incubator/compass/components/hydrator v0.0.0-20240228074947-02a81b1e3bf8/go.mod h1:E8Wf/ZyWvi48YsKZT0O9AVWLJI41Eakfk5xHz1mLeK4= github.com/kyma-incubator/compass/components/system-broker v0.0.0-20240228074947-02a81b1e3bf8 h1:/oXjEZTY5EVz2sI5WnZTaPT/DmOC3Npw8OT1TE/Vyz0= diff --git a/components/instance-creator/internal/client/automock/external_svc_caller.go b/components/instance-creator/internal/client/automock/external_svc_caller.go index 9f5206335a..e4f2389108 100644 --- a/components/instance-creator/internal/client/automock/external_svc_caller.go +++ b/components/instance-creator/internal/client/automock/external_svc_caller.go @@ -4,7 +4,6 @@ package automock import ( http "net/http" - testing "testing" mock "github.com/stretchr/testify/mock" ) @@ -19,6 +18,10 @@ func (_m *ExternalSvcCaller) Call(_a0 *http.Request) (*http.Response, error) { ret := _m.Called(_a0) var r0 *http.Response + var r1 error + if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok { + return rf(_a0) + } if rf, ok := ret.Get(0).(func(*http.Request) *http.Response); ok { r0 = rf(_a0) } else { @@ -27,7 +30,6 @@ func (_m *ExternalSvcCaller) Call(_a0 *http.Request) (*http.Response, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(*http.Request) error); ok { r1 = rf(_a0) } else { @@ -37,8 +39,12 @@ func (_m *ExternalSvcCaller) Call(_a0 *http.Request) (*http.Response, error) { return r0, r1 } -// NewExternalSvcCaller creates a new instance of ExternalSvcCaller. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewExternalSvcCaller(t testing.TB) *ExternalSvcCaller { +// NewExternalSvcCaller creates a new instance of ExternalSvcCaller. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewExternalSvcCaller(t interface { + mock.TestingT + Cleanup(func()) +}) *ExternalSvcCaller { mock := &ExternalSvcCaller{} mock.Mock.Test(t) diff --git a/components/pairing-adapter/go.mod b/components/pairing-adapter/go.mod index 9aaae62d6d..983ca73852 100644 --- a/components/pairing-adapter/go.mod +++ b/components/pairing-adapter/go.mod @@ -59,7 +59,7 @@ require ( github.com/imdario/mergo v0.3.14 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8 + github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937 github.com/mailru/easyjson v0.7.7 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/components/pairing-adapter/go.sum b/components/pairing-adapter/go.sum index 7315ec0d9f..9a87128d4d 100644 --- a/components/pairing-adapter/go.sum +++ b/components/pairing-adapter/go.sum @@ -126,6 +126,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8 h1:ZnKp4kFSCTrot/02j+BrLvqeFbBXo448hgtWm+knZ/I= github.com/kyma-incubator/compass/components/director v0.0.0-20240228074947-02a81b1e3bf8/go.mod h1:WG/lUocX9lA2E3LPaI7Oqm8RZDmB46+jtft2SC0ScVY= +github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937 h1:Xl/jHKo5vduKaBjl9Viy6HkfOP2i70tqUgfx9cnEcuc= +github.com/kyma-incubator/compass/components/director v0.0.0-20240301073936-1a4c377a3937/go.mod h1:m2uughFQ1t+J24NGz5N3E87n6HHmT+qzsXlpzxHnjKY= github.com/kyma-incubator/compass/components/hydrator v0.0.0-20240228074947-02a81b1e3bf8 h1:Ig4/5zfGADb7oCL6YQ4ZkHs4WADhPDYX+NcRWBPNxL4= github.com/kyma-incubator/compass/components/hydrator v0.0.0-20240228074947-02a81b1e3bf8/go.mod h1:E8Wf/ZyWvi48YsKZT0O9AVWLJI41Eakfk5xHz1mLeK4= github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= diff --git a/components/pairing-adapter/internal/adapter/automock/HTTPDoer.go b/components/pairing-adapter/internal/adapter/automock/HTTPDoer.go index fdc75bd3d5..555ec58f3f 100644 --- a/components/pairing-adapter/internal/adapter/automock/HTTPDoer.go +++ b/components/pairing-adapter/internal/adapter/automock/HTTPDoer.go @@ -18,6 +18,10 @@ func (_m *HTTPDoer) Do(r *http.Request) (*http.Response, error) { ret := _m.Called(r) var r0 *http.Response + var r1 error + if rf, ok := ret.Get(0).(func(*http.Request) (*http.Response, error)); ok { + return rf(r) + } if rf, ok := ret.Get(0).(func(*http.Request) *http.Response); ok { r0 = rf(r) } else { @@ -26,7 +30,6 @@ func (_m *HTTPDoer) Do(r *http.Request) (*http.Response, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(*http.Request) error); ok { r1 = rf(r) } else { @@ -35,3 +38,17 @@ func (_m *HTTPDoer) Do(r *http.Request) (*http.Response, error) { return r0, r1 } + +// NewHTTPDoer creates a new instance of HTTPDoer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewHTTPDoer(t interface { + mock.TestingT + Cleanup(func()) +}) *HTTPDoer { + mock := &HTTPDoer{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +}