Skip to content

Commit 3f31f07

Browse files
b-longb-long
authored
Merge pull request #52 from b-long/develop
Python SDK v0.2.14: Guard `sdk.WithInsecureSkipVerifyConn()` using `INSECURE_SKIP_VERIFY` env var
2 parents dc41b46 + c282bad commit 3f31f07

20 files changed

+102
-241
lines changed

‎.github/workflows/build-golang-macos.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: true
2121
matrix:
22-
go-version: [1.22.x]
22+
go-version: [1.24.x]
2323
python3_version: [ "3.11", "3.12" ]
2424

2525
steps:
@@ -47,4 +47,4 @@ jobs:
4747
4848
# - uses: ./.github/workflows/platform-integration-test.yaml
4949
# with:
50-
# wheel: dist/otdf_python-0.2.12-py3-none-any.whl
50+
# wheel: dist/otdf_python-0.2.14-py3-none-any.whl

‎.github/workflows/build-golang-ubuntu.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
go-version: [1.22.x]
18+
go-version: [1.24.x]
1919
python3_version: [ "3.11", "3.12" ]
2020

2121
steps:
@@ -43,12 +43,12 @@ jobs:
4343
4444
- uses: actions/cache/restore@v4
4545
with:
46-
path: dist/otdf_python-0.2.12-py3-none-any.whl
46+
path: dist/otdf_python-0.2.14-py3-none-any.whl
4747
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}
4848

4949
- uses: actions/cache/save@v4
5050
with:
51-
path: dist/otdf_python-0.2.12-py3-none-any.whl
51+
path: dist/otdf_python-0.2.14-py3-none-any.whl
5252
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}
5353
restore-keys: |
5454
${{ runner.os }}${{ matrix.python3_version }}-data-
@@ -61,5 +61,5 @@ jobs:
6161
needs: build
6262
uses: ./.github/workflows/platform-integration-test.yaml
6363
with:
64-
wheel: dist/otdf_python-0.2.12-py3-none-any.whl
64+
wheel: dist/otdf_python-0.2.14-py3-none-any.whl
6565
python_version: ${{ matrix.python3_version }}

‎.github/workflows/build-python.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
strategy:
1414
matrix:
15-
go-version: [1.22.x]
16-
# go-version: [ '1.19', '1.20', '1.22.x' ]
15+
go-version: [1.24.x]
1716

1817
steps:
1918
- uses: actions/checkout@v4

‎.github/workflows/lint-on-macos.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
go-version: [1.22.x]
16-
# go-version: [ '1.19', '1.20', '1.22.x' ]
15+
go-version: [1.24.x]
1716

1817
steps:
1918
- uses: actions/checkout@v4

‎.github/workflows/lint-on-ubuntu.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
go-version: [1.22.x]
16-
# go-version: [ '1.19', '1.20', '1.22.x' ]
15+
go-version: [1.24.x]
1716

1817
steps:
1918
- uses: actions/checkout@v4

‎.github/workflows/platform-integration-test.yaml‎

Lines changed: 3 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions/cache/restore@v4
3131
with:
32-
path: dist/otdf_python-0.2.12-py3-none-any.whl
32+
path: dist/otdf_python-0.2.14-py3-none-any.whl
3333
key: ${{ runner.os }}${{ inputs.python_version }}-data-${{ github.sha }}
3434

3535
- name: Prove that the input file is available
@@ -52,7 +52,7 @@ jobs:
5252
- name: Set up go
5353
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
5454
with:
55-
go-version: "1.22.x"
55+
go-version: "1.24.x"
5656
check-latest: false
5757
cache-dependency-path: |
5858
platform/service/go.sum
@@ -125,6 +125,7 @@ jobs:
125125
OPENTDF_HOSTNAME: "localhost:8080"
126126
OIDC_TOKEN_ENDPOINT: "http://localhost:8888/auth/realms/opentdf/protocol/openid-connect/token"
127127
OPENTDF_KAS_URL: "http://localhost:8080/kas"
128+
INSECURE_SKIP_VERIFY: "TRUE"
128129
run: |
129130
mkdir validation
130131
wheel="$(basename ${{ inputs.wheel }} )"
@@ -136,119 +137,7 @@ jobs:
136137
pip install ./"$wheel"
137138
python validate_otdf_python.py
138139
139-
# - name: Validate the SDK through the command line interface
140-
# run: |
141-
# printf 'here is some data to encrypt' > data
142-
143-
# java -jar target/cmdline.jar \
144-
# --client-id=opentdf-sdk \
145-
# --client-secret=secret \
146-
# --platform-endpoint=localhost:8080 \
147-
# -i \
148-
# encrypt --kas-url=localhost:8080 --mime-type=text/plain --attr https://example.com/attr/attr1/value/value1 --autoconfigure=false -f data -m 'here is some metadata' > test.tdf
149-
150-
# java -jar target/cmdline.jar \
151-
# --client-id=opentdf-sdk \
152-
# --client-secret=secret \
153-
# --platform-endpoint=localhost:8080 \
154-
# -i \
155-
# decrypt -f test.tdf > decrypted
156-
157-
# java -jar target/cmdline.jar \
158-
# --client-id=opentdf-sdk \
159-
# --client-secret=secret \
160-
# --platform-endpoint=localhost:8080 \
161-
# -i \
162-
# metadata -f test.tdf > metadata
163-
164-
# if ! diff -q data decrypted; then
165-
# printf 'decrypted data is incorrect [%s]' "$(< decrypted)"
166-
# exit 1
167-
# fi
168-
169-
# if [ "$(< metadata)" != 'here is some metadata' ]; then
170-
# printf 'metadata is incorrect [%s]\n' "$(< metadata)"
171-
# exit 1
172-
# fi
173-
# working-directory: cmdline
174-
175-
# - name: Encrypt/Decrypt NanoTDF
176-
# run: |
177-
# echo 'here is some data to encrypt' > data
178-
179-
# java -jar target/cmdline.jar \
180-
# --client-id=opentdf-sdk \
181-
# --client-secret=secret \
182-
# --platform-endpoint=localhost:8080 \
183-
# -i \
184-
# encryptnano --kas-url=http://localhost:8080 --attr https://example.com/attr/attr1/value/value1 -f data -m 'here is some metadata' > nano.ntdf
185-
186-
# java -jar target/cmdline.jar \
187-
# --client-id=opentdf-sdk \
188-
# --client-secret=secret \
189-
# --platform-endpoint=localhost:8080 \
190-
# -i \
191-
# decryptnano -f nano.ntdf > decrypted
192-
193-
# if ! diff -q data decrypted; then
194-
# printf 'decrypted data is incorrect [%s]' "$(< decrypted)"
195-
# exit 1
196-
# fi
197-
# working-directory: cmdline
198-
199-
# - uses: JarvusInnovations/background-action@2428e7b970a846423095c79d43f759abf979a635
200-
# name: start another KAS server in background
201-
# with:
202-
# run: >
203-
# <opentdf.yaml >opentdf-beta.yaml yq e '
204-
# (.server.port = 8282)
205-
# | (.mode = ["kas"])
206-
# | (.sdk_config = {"endpoint":"http://localhost:8080","plaintext":true,"client_id":"opentdf","client_secret":"secret"})
207-
# '
208-
# && go run ./service --config-file ./opentdf-beta.yaml start
209-
# wait-on: |
210-
# tcp:localhost:8282
211-
# log-output-if: true
212-
# wait-for: 90s
213-
# working-directory: platform
214-
# - name: Make sure that the second platform is up
215-
# run: |
216-
# grpcurl -plaintext localhost:8282 kas.AccessService/PublicKey
217-
# - name: Validate multikas through the command line interface
218-
# run: |
219-
# printf 'here is some data to encrypt' > data
220-
221-
# java -jar target/cmdline.jar \
222-
# --client-id=opentdf-sdk \
223-
# --client-secret=secret \
224-
# --platform-endpoint=localhost:8080 \
225-
# -i \
226-
# encrypt --kas-url=localhost:8080,localhost:8282 -f data -m 'here is some metadata' > test.tdf
227-
228-
# java -jar target/cmdline.jar \
229-
# --client-id=opentdf-sdk \
230-
# --client-secret=secret \
231-
# --platform-endpoint=localhost:8080 \
232-
# -i \
233-
# decrypt -f test.tdf > decrypted
234-
235-
# java -jar target/cmdline.jar \
236-
# --client-id=opentdf-sdk \
237-
# --client-secret=secret \
238-
# --platform-endpoint=localhost:8080 \
239-
# -i \
240-
# metadata -f test.tdf > metadata
241-
242-
# if ! diff -q data decrypted; then
243-
# printf 'decrypted data is incorrect [%s]' "$(< decrypted)"
244-
# exit 1
245-
# fi
246140
247-
# if [ "$(< metadata)" != 'here is some metadata' ]; then
248-
# printf 'metadata is incorrect [%s]\n' "$(< metadata)"
249-
# exit 1
250-
# fi
251-
# working-directory: cmdline
252141
253142
# platform-xtest:
254143
# permissions:

‎.github/workflows/publish-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: set up Go
3131
uses: actions/setup-go@v3
3232
with:
33-
go-version: "1.22.x"
33+
go-version: "1.24.x"
3434

3535
- name: Setup project files
3636
run: |
@@ -103,7 +103,7 @@ jobs:
103103
CIBW_ENVIRONMENT: >
104104
PATH=$PATH:/usr/local/go/bin
105105
CIBW_BEFORE_ALL_LINUX: |
106-
curl -o go.tar.gz https://dl.google.com/go/go1.22.7.linux-amd64.tar.gz
106+
curl -o go.tar.gz https://dl.google.com/go/go1.24.3.linux-amd64.tar.gz
107107
tar -C /usr/local -xzf go.tar.gz
108108
go install github.com/go-python/[email protected]
109109
go install golang.org/x/tools/cmd/goimports@latest
@@ -154,7 +154,7 @@ jobs:
154154
CIBW_ENVIRONMENT: >
155155
PATH=$PATH:/usr/local/go/bin
156156
CIBW_BEFORE_ALL_LINUX: |
157-
curl -o go.tar.gz https://dl.google.com/go/go1.22.7.linux-arm64.tar.gz
157+
curl -o go.tar.gz https://dl.google.com/go/go1.24.3.linux-arm64.tar.gz
158158
tar -C /usr/local -xzf go.tar.gz
159159
go install github.com/go-python/[email protected]
160160
go install golang.org/x/tools/cmd/goimports@latest
@@ -181,7 +181,7 @@ jobs:
181181
# - name: set up Go
182182
# uses: actions/setup-go@v3
183183
# with:
184-
# go-version: "1.22.x"
184+
# go-version: "1.24.x"
185185

186186
# - name: install gopy
187187
# run: go install github.com/go-python/[email protected]

‎.github/workflows/publish.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: set up Go
3131
uses: actions/setup-go@v3
3232
with:
33-
go-version: "1.22.x"
33+
go-version: "1.24.x"
3434

3535
- name: Setup project files
3636
run: |
@@ -103,7 +103,7 @@ jobs:
103103
CIBW_ENVIRONMENT: >
104104
PATH=$PATH:/usr/local/go/bin
105105
CIBW_BEFORE_ALL_LINUX: |
106-
curl -o go.tar.gz https://dl.google.com/go/go1.22.7.linux-amd64.tar.gz
106+
curl -o go.tar.gz https://dl.google.com/go/go1.24.3.linux-amd64.tar.gz
107107
tar -C /usr/local -xzf go.tar.gz
108108
go install github.com/go-python/[email protected]
109109
go install golang.org/x/tools/cmd/goimports@latest
@@ -154,7 +154,7 @@ jobs:
154154
CIBW_ENVIRONMENT: >
155155
PATH=$PATH:/usr/local/go/bin
156156
CIBW_BEFORE_ALL_LINUX: |
157-
curl -o go.tar.gz https://dl.google.com/go/go1.22.7.linux-arm64.tar.gz
157+
curl -o go.tar.gz https://dl.google.com/go/go1.24.3.linux-arm64.tar.gz
158158
tar -C /usr/local -xzf go.tar.gz
159159
go install github.com/go-python/[email protected]
160160
go install golang.org/x/tools/cmd/goimports@latest
@@ -181,7 +181,7 @@ jobs:
181181
# - name: set up Go
182182
# uses: actions/setup-go@v3
183183
# with:
184-
# go-version: "1.22.x"
184+
# go-version: "1.24.x"
185185

186186
# - name: install gopy
187187
# run: go install github.com/go-python/[email protected]

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Install from the [Python Package Index (PyPI)](https://pypi.org):
2727
pip install otdf_python
2828

2929
# Install a pinned version
30-
pip install otdf-python==0.2.12
30+
pip install otdf-python==0.2.14
3131

3232
# Install a pinned version, from test.pypi.org
33-
pip install -i https://test.pypi.org/simple/ otdf-python==0.2.12
33+
pip install -i https://test.pypi.org/simple/ otdf-python==0.2.14
3434
```
3535

3636
## Usage

‎build-scripts/ci-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ echo "✨✨✨ Build wheel"
7272
poetry run python3 setup.py bdist_wheel
7373

7474
echo "✨✨✨ Install wheel"
75-
pip install dist/otdf_python-0.2.12-py3-none-any.whl
75+
pip install dist/otdf_python-0.2.14-py3-none-any.whl

0 commit comments

Comments
 (0)