Skip to content

Commit ffaf4d8

Browse files
Merge branch 'master' into cis_partial_domain_setup
2 parents 4403b23 + a1bed15 commit ffaf4d8

18 files changed

+11325
-5694
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.24.0
2+
current_version = 0.26.2
33
commit = True
44
message = Update version {current_version} -> {new_version}
55

.github/workflows/codeql-analysis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,20 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
language: [ 'python' ]
31+
include:
32+
- language: python
33+
build-mode: none
3234
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3335
# Learn more:
3436
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3537

3638
steps:
3739
- name: Checkout repository
38-
uses: actions/checkout@v3
40+
uses: actions/checkout@v4
3941

4042
# Initializes the CodeQL tools for scanning.
4143
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v2
44+
uses: github/codeql-action/init@v3
4345
with:
4446
languages: ${{ matrix.language }}
4547
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +52,7 @@ jobs:
5052
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5153
# If this step fails, then you should remove it and run the build manually (see below)
5254
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v2
55+
uses: github/codeql-action/autobuild@v3
5456

5557
# ℹ️ Command-line programs to run using the OS shell.
5658
# 📚 https://git.io/JvXDl
@@ -64,4 +66,4 @@ jobs:
6466
# make release
6567

6668
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v2
69+
uses: github/codeql-action/analyze@v3

.github/workflows/codeql.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "master" ]
17+
pull_request:
18+
branches: [ "master" ]
19+
schedule:
20+
- cron: '39 19 * * 4'
21+
22+
jobs:
23+
analyze:
24+
name: Analyze (${{ matrix.language }})
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners (GitHub.com only)
29+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
32+
permissions:
33+
# required for all workflows
34+
security-events: write
35+
36+
# required to fetch internal or private CodeQL packs
37+
packages: read
38+
39+
# only required for workflows in private repositories
40+
actions: read
41+
contents: read
42+
43+
strategy:
44+
fail-fast: false
45+
matrix:
46+
include:
47+
- language: python
48+
build-mode: none
49+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
50+
# Use `c-cpp` to analyze code written in C, C++ or both
51+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
52+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
53+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
54+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
55+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
56+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
57+
steps:
58+
- name: Checkout repository
59+
uses: actions/checkout@v4
60+
61+
# Initializes the CodeQL tools for scanning.
62+
- name: Initialize CodeQL
63+
uses: github/codeql-action/init@v3
64+
with:
65+
languages: ${{ matrix.language }}
66+
build-mode: ${{ matrix.build-mode }}
67+
# If you wish to specify custom queries, you can do so here or in a config file.
68+
# By default, queries listed here will override any specified in a config file.
69+
# Prefix the list here with "+" to use these queries and those in the config file.
70+
71+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
72+
# queries: security-extended,security-and-quality
73+
74+
# If the analyze step fails for one of the languages you are analyzing with
75+
# "We were unable to automatically build your code", modify the matrix above
76+
# to set the build mode to "manual" for that language. Then modify this step
77+
# to build your code.
78+
# ℹ️ Command-line programs to run using the OS shell.
79+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
80+
- if: matrix.build-mode == 'manual'
81+
run: |
82+
echo 'If you are using a "manual" build mode for one or more of the' \
83+
'languages you are analyzing, replace this with the commands to build' \
84+
'your code, for example:'
85+
echo ' make bootstrap'
86+
echo ' make release'
87+
exit 1
88+
89+
- name: Perform CodeQL Analysis
90+
uses: github/codeql-action/analyze@v3
91+
with:
92+
category: "/language:${{matrix.language}}"

.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ notifications:
99

1010
matrix:
1111
include:
12-
- python: 3.7
12+
- python: 3.9
1313
before_script:
1414
- >-
1515
[ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]
@@ -19,8 +19,8 @@ matrix:
1919
&& openssl aes-256-cbc -K $encrypted_fc092b9428d6_key -iv $encrypted_fc092b9428d6_iv -in cis.env.enc -out cis.env -d || true
2020
&& openssl aes-256-cbc -K $encrypted_89a9eb4f9417_key -iv $encrypted_89a9eb4f9417_iv -in dns.env.enc -out dns.env -d || true
2121
- python: 3.8
22-
- python: 3.9
2322
- python: 3.10
23+
- python: 3.11
2424

2525
before_install:
2626
- sudo apt-get update
@@ -29,12 +29,15 @@ before_install:
2929
- echo -e "machine github.ibm.com\n login $GH_TOKEN" > ~/.netrc
3030

3131
install:
32+
- sudo rm /etc/apt/sources.list.d/mongodb-4.4.list
33+
- wget -O- https://pgp.mongodb.com/server-4.4.asc | sudo gpg --dearmor -o /usr/share/keyrings/mongodb-4.4.gpg
34+
- echo "deb [signed-by=/usr/share/keyrings/mongodb-4.4.gpg] http://repo.mongodb.org/apt/ubuntu $(lsb_release -cs)/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-4.4.list
3235
- pip install tox-travis
3336

3437
script: tox
3538

3639
before_deploy:
37-
- nvm install 18
40+
- nvm install 20
3841
- npm install npm@latest -g
3942
- npm install @semantic-release/changelog
4043
- npm install @semantic-release/exec
@@ -47,7 +50,7 @@ deploy:
4750
script: npx semantic-release
4851
skip_cleanup: true
4952
on:
50-
python: '3.7'
53+
python: '3.9'
5154
branch: master
5255
- provider: pypi
5356
setuptools_version: "60.8.2"
@@ -56,5 +59,5 @@ deploy:
5659
repository: https://upload.pypi.org/legacy
5760
skip_cleanup: true
5861
on:
59-
python: '3.7'
62+
python: '3.9'
6063
tags: true

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
## [0.26.2](https://github.com/IBM/networking-python-sdk/compare/v0.26.1...v0.26.2) (2024-06-17)
2+
3+
4+
### Bug Fixes
5+
6+
* Another possible fix for travis failure ([#114](https://github.com/IBM/networking-python-sdk/issues/114)) ([d18c6e5](https://github.com/IBM/networking-python-sdk/commit/d18c6e53ddd08324a2f5990a88207cde6e394ea7))
7+
8+
## [0.26.1](https://github.com/IBM/networking-python-sdk/compare/v0.26.0...v0.26.1) (2024-06-14)
9+
10+
11+
### Bug Fixes
12+
13+
* fixing the PGP mongodb reference issue ([#112](https://github.com/IBM/networking-python-sdk/issues/112)) ([10e6007](https://github.com/IBM/networking-python-sdk/commit/10e6007a083fb4b0a5c49ff10f64432ddee624e7))
14+
15+
# [0.26.0](https://github.com/IBM/networking-python-sdk/compare/v0.25.0...v0.26.0) (2024-06-12)
16+
17+
18+
### Features
19+
20+
* Added the new connection type - Redundant GRE ([#105](https://github.com/IBM/networking-python-sdk/issues/105)) ([5e6e23a](https://github.com/IBM/networking-python-sdk/commit/5e6e23a83ce70dfc3003fbc23dcfb904edec8cf4))
21+
22+
# [0.25.0](https://github.com/IBM/networking-python-sdk/compare/v0.24.0...v0.25.0) (2024-03-14)
23+
24+
25+
### Bug Fixes
26+
27+
* udating dependency versions ([#95](https://github.com/IBM/networking-python-sdk/issues/95)) ([9cfd59b](https://github.com/IBM/networking-python-sdk/commit/9cfd59b99e7b3896fdd3df72597de19c77fc12ee))
28+
29+
30+
### Features
31+
32+
* direct link changes build release ([2ed3b18](https://github.com/IBM/networking-python-sdk/commit/2ed3b1893701da168ac54a9f2ec49549c44752d7))
33+
* directlink - dedicated vlan mapping ([1cb591a](https://github.com/IBM/networking-python-sdk/commit/1cb591a5ba79a3fb03dfceb3926ac476e29491a7))
34+
* directlink provider updated to latest spec ([0bd2ad1](https://github.com/IBM/networking-python-sdk/commit/0bd2ad1a99b74021ffd6281f7f8047821cea5e95))
35+
* Updating the list of reserved ASN numbers ([#92](https://github.com/IBM/networking-python-sdk/issues/92)) ([b5ca185](https://github.com/IBM/networking-python-sdk/commit/b5ca185a4a2faa7dc692a7992ad3d2ad85e9808b))
36+
137
# [0.24.0](https://github.com/IBM/networking-python-sdk/compare/v0.23.2...v0.24.0) (2023-09-12)
238

339

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
77
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
88

9-
# IBM Cloud Networking Services Python SDK Version 0.24.0
9+
# IBM Cloud Networking Services Python SDK Version 0.26.2
1010

1111
Python client library to interact with various [IBM Cloud Networking Service APIs](https://cloud.ibm.com/apidocs?category=network).
1212

@@ -22,7 +22,7 @@ Python client library to interact with various [IBM Cloud Networking Service API
2222
npx markdown-toc -i README.md
2323
-->
2424

25-
<!-- toc -->
25+
<! -- toc -->
2626

2727
- [Overview](#overview)
2828
- [Prerequisites](#prerequisites)
@@ -99,13 +99,13 @@ IBM Cloud services:
9999
To install, use `pip` or `easy_install`:
100100

101101
```bash
102-
pip install --upgrade "ibm-cloud-networking-services==0.24.0"
102+
pip install --upgrade "ibm-cloud-networking-services==0.26.2"
103103
```
104104

105105
or
106106

107107
```bash
108-
easy_install --upgrade "ibm-cloud-networking-servies==0.24.0"
108+
easy_install --upgrade "ibm-cloud-networking-servies==0.26.2"
109109
```
110110

111111
## Using the SDK

dl.env.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ export DL_SERVICES_APIKEY="<IAM-API-KEY>"
33
export DL_SERVICES_LOCATION_NAME=dal09
44
export DL_SERVICES_LOCATION_LONG_NAME='Dallas 09'
55
export DL_SERVICES_SERVICE_URL=https://directlink.test.cloud.ibm.com/v1
6+
export DL_PROVIDER_SERVICES_URL_V2=https://directlink.test.cloud.ibm.com/provider/v2
7+
export DL_PROVIDER_SERVICES_APIKEY="<IAM-API-KEY>"
8+
export DL_PROVIDER_SERVICES_CUSTOMER_ACCT_ID="<UUID>"
69
export DL_SERVICES_IAM_URL=https://iam.test.cloud.ibm.com/identity/token
710
export DL_SERVICES_GW_NAME=SDK-PY-DL-gateway
11+
export DL_PROVIDER_SERVICES_GW_NAME=SDK-PVDR-PY-DL-gw
12+
export DL_PROVIDER_SERVICES_UPDATED_GW_NAME=SDK-PVDR-PY-DL-gw-updated
813
export DL_SERVICES_CONN_NAME=SDK-PY-DL-vc
914
export DL_SERVICES_AUTHENTICATION_KEY=crn:v1:public:is:us-south:a/3b1bd7fa2bc3406ea70ba4ade8aa3f1b::vpc:r134-1680db5a-7672-41af-89fb-bbbc94ac6964

0 commit comments

Comments
 (0)