From: garciadeblas Date: Wed, 5 Jul 2023 14:46:11 +0000 (+0200) Subject: Fix bug 2268 to use previous GCP libraries that do not present the connection issues X-Git-Tag: release-v15.0-start~11 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F13632%2F3;p=osm%2FRO.git Fix bug 2268 to use previous GCP libraries that do not present the connection issues Change-Id: I3fec15cddb795fe21f15ca58195bb11283024d26 Signed-off-by: garciadeblas --- diff --git a/RO-VIM-gcp/requirements.in b/RO-VIM-gcp/requirements.in index 85461d61..0bd19cd7 100644 --- a/RO-VIM-gcp/requirements.in +++ b/RO-VIM-gcp/requirements.in @@ -15,7 +15,9 @@ ## netaddr -google-api-python-client -google-auth +google-api-python-client==2.51.0 +google-auth==2.8.0 +google-api-core==2.8.2 +googleapis-common-protos==1.56.3 google-cloud paramiko diff --git a/releasenotes/notes/fix_bug_2268_for_gcp_client_auth-7edf69160d4c1f20.yaml b/releasenotes/notes/fix_bug_2268_for_gcp_client_auth-7edf69160d4c1f20.yaml new file mode 100644 index 00000000..41490a3d --- /dev/null +++ b/releasenotes/notes/fix_bug_2268_for_gcp_client_auth-7edf69160d4c1f20.yaml @@ -0,0 +1,24 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +--- +fixes: + - | + Fix Bug 2268 + + Revert to previous GCP libraries that don' present the GCP client + authentication issues that make the connection unstable. + diff --git a/requirements-dev.txt b/requirements-dev.txt index 9bbe0e88..9f8bd6dd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -22,6 +22,10 @@ async-timeout==4.0.2 # aiokafka dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master +dnspython==2.3.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master + # pymongo kafka-python==2.0.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master diff --git a/requirements-test.txt b/requirements-test.txt index d0375539..43afc3c7 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,7 +16,7 @@ ####################################################################################### -e RO-plugin # via -r requirements-test.in -coverage==7.2.5 +coverage==7.2.7 # via -r requirements-test.in mock==5.0.2 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index ae1af3b3..1bf0ab16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -54,7 +54,7 @@ bcrypt==4.0.1 # via paramiko boto==2.49.0 # via -r RO-VIM-aws/requirements.in -cachetools==5.3.0 +cachetools==5.3.1 # via google-auth certifi==2023.5.7 # via @@ -105,11 +105,11 @@ dogpile-cache==1.2.0 # via openstacksdk flufl-enum==5.0.1 # via pyvcloud -google-api-core==2.11.0 +google-api-core==2.8.2 # via google-api-python-client -google-api-python-client==2.86.0 +google-api-python-client==2.51.0 # via -r RO-VIM-gcp/requirements.in -google-auth==2.17.3 +google-auth==2.8.0 # via # -r RO-VIM-gcp/requirements.in # google-api-core @@ -119,7 +119,7 @@ google-auth-httplib2==0.1.0 # via google-api-python-client google-cloud==0.34.0 # via -r RO-VIM-gcp/requirements.in -googleapis-common-protos==1.59.0 +googleapis-common-protos==1.56.3 # via google-api-core httplib2==0.22.0 # via diff --git a/tox.ini b/tox.ini index 44220840..1ea8f410 100644 --- a/tox.ini +++ b/tox.ini @@ -209,7 +209,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -217,7 +217,7 @@ commands = - bash -c "for file in requirements*.in ; do \ UNSAFE="" ; \ if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \ - pip-compile -rU --no-header $UNSAFE $file ;\ + pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\ out=`echo $file | sed 's/.in/.txt/'` ; \ sed -i -e '1 e head -16 tox.ini' $out ;\ done"