Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Increase dependencies (#2027)
Browse files Browse the repository at this point in the history 
* Update deps in system-broker

* Increase deps in director

* Bump director version in other components

* Bump connector version in components

* Fix problems in connectivity-adapter

* Fix gql problems in connector and director

* Fix problems in tests

* Bump director in components

* Bump system-broker in components

* Fix gql problem in director

* Bump connector in components

* Bump operations-controller in components

* Bump gateway in components

* Fix problems in tests

* Bump connectivity-adapter in components

* Bump external-services-mock in components

* Minor improvements

* Some improvements

* Fix gqlgen problem

* Update values.yaml

* Add dependency for benchmark tests

* Bump compass-console PR number
  • Loading branch information
@StefanCholakov
StefanCholakov authored Sep 24, 2021
1 parent 1c732d9 commit 541ed1c
Show file tree
Hide file tree
Showing 35 changed files with 1,640 additions and 390 deletions.
20 changes: 10 additions & 10 deletions chart/compass/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ global:
path: eu.gcr.io/kyma-project/incubator
connector:
dir:
version: "PR-2003"
version: "PR-2027"
connectivity_adapter:
dir:
version: "PR-2003"
version: "PR-2027"
pairing_adapter:
dir:
version: "PR-2003"
version: "PR-2027"
director:
dir:
version: "PR-2029"
version: "PR-2027"
gateway:
dir:
version: "PR-2003"
version: "PR-2027"
operations_controller:
dir:
version: "PR-1996"
version: "PR-2027"
ord_service:
dir:
version: "PR-41"
Expand All @@ -90,21 +90,21 @@ global:
version: "PR-1998"
system_broker:
dir:
version: "PR-2003"
version: "PR-2027"
certs_setup_job:
containerRegistry:
path: eu.gcr.io/kyma-project
dir:
version: "0a651695"
external_services_mock:
dir:
version: "PR-2003"
version: "PR-2027"
console:
dir:
version: "PR-42"
version: "PR-44"
e2e_tests:
dir:
version: "PR-2028"
version: "PR-2027"
isLocalEnv: false
oauth2:
host: oauth2
Expand Down
10 changes: 5 additions & 5 deletions components/connectivity-adapter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/kyma-incubator/compass/components/connector v0.0.0-20210831121533-7e4208095db0
github.com/kyma-incubator/compass/components/director v0.0.0-20210831121533-7e4208095db0
github.com/json-iterator/go v1.1.11 // indirect
github.com/kyma-incubator/compass/components/connector v0.0.0-20210922140315-d2f37c2e160d
github.com/kyma-incubator/compass/components/director v0.0.0-20210922113925-7ff5909fa72b
github.com/machinebox/graphql v0.2.3-0.20181106130121-3a9253180225
github.com/mitchellh/copystructure v1.1.2 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
Expand All @@ -35,7 +35,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cast v1.4.0 // indirect
github.com/stretchr/objx v0.3.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/vektah/gqlparser/v2 v2.1.0 // indirect
Expand All @@ -45,7 +45,7 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 // indirect
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/text v0.3.6 // indirect
gopkg.in/asaskevich/govalidator.v9 v9.0.0-20180315120708-ccb8e960c48f
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
163 changes: 150 additions & 13 deletions components/connectivity-adapter/go.sum
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions components/connectivity-adapter/internal/appregistry/service/converter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (c *converter) DetailsToGraphQLCreateInput(deprecated model.ServiceDetails)

// old way of providing request headers
if deprecated.Api.Headers != nil {
h, err := graphql.NewHttpHeadersSerialized(*deprecated.Api.Headers)
h, err := graphql.NewHTTPHeadersSerialized(*deprecated.Api.Headers)
if err != nil {
return graphql.BundleCreateInput{}, err
}
Expand All @@ -110,7 +110,7 @@ func (c *converter) DetailsToGraphQLCreateInput(deprecated model.ServiceDetails)
// new way
if deprecated.Api.RequestParameters != nil {
if deprecated.Api.RequestParameters.Headers != nil {
h, err := graphql.NewHttpHeadersSerialized(*deprecated.Api.RequestParameters.Headers)
h, err := graphql.NewHTTPHeadersSerialized(*deprecated.Api.RequestParameters.Headers)
if err != nil {
return graphql.BundleCreateInput{}, err
}
Expand Down Expand Up @@ -199,7 +199,7 @@ func (c *converter) DetailsToGraphQLCreateInput(deprecated model.ServiceDetails)

if deprecated.Api.SpecificationRequestParameters != nil && apiDef.Spec.FetchRequest != nil {
if deprecated.Api.SpecificationRequestParameters.Headers != nil {
h, err := graphql.NewHttpHeadersSerialized(*deprecated.Api.SpecificationRequestParameters.Headers)
h, err := graphql.NewHTTPHeadersSerialized(*deprecated.Api.SpecificationRequestParameters.Headers)
if err != nil {
return graphql.BundleCreateInput{}, err
}
Expand Down
6 changes: 3 additions & 3 deletions components/connectivity-adapter/internal/appregistry/service/converter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

func TestConverter_DetailsToGraphQLCreateInput(t *testing.T) {
additionalQueryParamsSerialized := graphql.QueryParamsSerialized(`{"q1":["a","b"],"q2":["c","d"]}`)
additionalHeadersSerialized := graphql.HttpHeadersSerialized(`{"h1":["e","f"],"h2":["g","h"]}`)
additionalHeadersSerialized := graphql.HTTPHeadersSerialized(`{"h1":["e","f"],"h2":["g","h"]}`)

type testCase struct {
given model.ServiceDetails
Expand Down Expand Up @@ -546,7 +546,7 @@ func TestConverter_GraphQLToServiceDetails(t *testing.T) {
"q1": []string{"a", "b"},
"q2": []string{"c", "d"},
},
AdditionalHeaders: graphql.HttpHeaders{
AdditionalHeaders: graphql.HTTPHeaders{
"h1": []string{"e", "f"},
"h2": []string{"g", "h"},
},
Expand Down Expand Up @@ -670,7 +670,7 @@ func TestConverter_GraphQLToServiceDetails(t *testing.T) {
"q1": {"a", "b"},
"q2": {"c", "d"},
},
AdditionalHeaders: graphql.HttpHeaders{
AdditionalHeaders: graphql.HTTPHeaders{
"h1": {"e", "f"},
"h2": {"g", "h"},
},
Expand Down
24 changes: 14 additions & 10 deletions components/connector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,31 @@ module github.com/kyma-incubator/compass/components/connector
go 1.17

require (
cloud.google.com/go v0.65.0 // indirect
cloud.google.com/go v0.81.0 // indirect
github.com/99designs/gqlgen v0.11.0
github.com/agnivade/levenshtein v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/kyma-incubator/compass/components/director v0.0.0-20210831121533-7e4208095db0
github.com/json-iterator/go v1.1.11 // indirect
github.com/kyma-incubator/compass/components/director v0.0.0-20210922113925-7ff5909fa72b
github.com/machinebox/graphql v0.2.3-0.20181106130121-3a9253180225
github.com/matryer/is v1.4.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/onrik/logrus v0.9.0 // indirect
github.com/onsi/ginkgo v1.16.1 // indirect
github.com/onsi/gomega v1.11.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0 // indirect
Expand All @@ -36,19 +39,20 @@ require (
github.com/vrischmann/envconfig v1.3.0
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.25.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/api v0.20.2 //DO NOT BUMP
k8s.io/apimachinery v0.20.2 //DO NOT BUMP
k8s.io/client-go v0.20.2 //DO NOT BUMP
k8s.io/klog/v2 v2.4.0 // indirect
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
Expand Down
Loading

0 comments on commit 541ed1c

Please sign in to comment.