Skip to content

Commit f9ac42d

Browse files
Merge branch 'php/http_api' into phpdev-async-http
# Conflicts: # php/src/vaas/Authentication/AuthenticatorInterface.php # php/src/vaas/Authentication/ClientCredentialsGrantAuthenticator.php # php/src/vaas/Authentication/ResourceOwnerPasswordGrantAuthenticator.php # php/src/vaas/Authentication/TokenReceiver.php # php/src/vaas/Options/ForStreamOptions.php # php/src/vaas/Options/VaasOptions.php # php/src/vaas/Vaas.php # php/tests/VaasTesting/AuthenticatorTest.php # php/tests/VaasTesting/VaasTest.php # php/tests/VaasTesting/composer.json
2 parents bd48e3a + 1e0bd96 commit f9ac42d

File tree

38 files changed

+518
-317
lines changed

38 files changed

+518
-317
lines changed

.github/workflows/ci-git-scan.yaml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/ci-golang.yaml

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
default: "production"
2727

2828
env:
29+
LATEST_PATH: v3/
2930
CLIENT_ID: ${{ secrets.CLIENT_ID }}
3031
CLIENT_SECRET: ${{secrets.CLIENT_SECRET}}
3132
VAAS_URL: "wss://gateway.production.vaas.gdatasecurity.de"
@@ -193,7 +194,7 @@ jobs:
193194
- name: publish module
194195
env:
195196
MAJOR_VERSION: ${{ needs.extract-major-version.outputs.major_version }}
196-
if: startsWith(github.ref, 'refs/tags')
197+
if: startsWith(github.ref, 'refs/tags/golang/vaas/v3<')
197198
run: |
198199
if [ "$MAJOR_VERSION" = "v1" ]; then
199200
GOPROXY=proxy.golang.org go list -m github.com/GDATASoftwareAG/vaas/golang/vaas@${GITHUB_REF#refs/tags/golang/vaas/}
@@ -209,3 +210,52 @@ jobs:
209210
title: "`Failed workflow on for VaaS-SDK vaas-golang-ci`"
210211
job: ${{ toJson(job) }}
211212
steps: ${{ toJson(steps) }}
213+
214+
deploy-git-scan:
215+
if: startsWith(github.ref, 'refs/tags')
216+
needs:
217+
- extract-major-version
218+
- virus-scan
219+
- build-golang
220+
- codeql
221+
- vulncheck
222+
permissions:
223+
contents: read
224+
packages: write
225+
runs-on: ubuntu-latest
226+
steps:
227+
- uses: actions/checkout@v4
228+
229+
- name: Set up Docker Buildx
230+
uses: docker/setup-buildx-action@v3
231+
232+
- name: Docker meta
233+
env:
234+
MAJOR_VERSION: ${{ needs.extract-major-version.outputs.major_version }}
235+
uses: docker/metadata-action@v5
236+
id: meta
237+
with:
238+
images: |
239+
ghcr.io/gdatasoftwareag/vaas/git-scan
240+
tags: |
241+
type=semver,pattern={{version}},value=${{ env.MAJOR_VERSION }}
242+
type=semver,pattern={{major}}.{{minor}},value=${{ env.MAJOR_VERSION }}
243+
type=semver,pattern={{major}},value=${{ env.MAJOR_VERSION }}
244+
flavor: |
245+
latest=auto
246+
247+
- name: login to ghcr.io/gdatasoftwareag
248+
uses: docker/login-action@v3
249+
with:
250+
registry: ghcr.io
251+
username: ${{ secrets.GHCR_IO_GDATASOFTWAREAG_USERNAME }}
252+
password: ${{ secrets.GHCR_IO_GDATASOFTWAREAG_PASSWORD }}
253+
254+
- name: Build and push
255+
uses: docker/build-push-action@v6
256+
with:
257+
context: "golang/vaas/${{ env.LATEST_PATH }}"
258+
file: "golang/vaas/${{ env.LATEST_PATH }}git-scan.Dockerfile"
259+
push: true
260+
tags: ${{ steps.meta.outputs.tags }}
261+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/ci-php.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-22.04
4242
strategy:
4343
matrix:
44-
version: ["8.1", "8.2", "8.3"]
44+
version: ["8.1", "8.2", "8.3", "8.4"]
4545
steps:
4646
- name: checkout
4747
uses: actions/checkout@v4

dotnet/Vaas/.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "0.30.2",
6+
"version": "0.30.6",
77
"commands": [
88
"dotnet-csharpier"
99
]

dotnet/Vaas/src/Vaas/Vaas.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>0.0.13</Version>
4+
<Version>0.0.15</Version>
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<TargetFramework>net8.0</TargetFramework>
77
<Nullable>enable</Nullable>
@@ -22,14 +22,14 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
25+
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
2626
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
2727
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
2828
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
2929
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
3030
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
31-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
32-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
31+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
32+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
3333
<PackageReference Include="Websocket.Client" Version="5.1.2" />
3434
</ItemGroup>
3535

dotnet/Vaas/test/Vaas.Test/Vaas.Test.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<PackageReference Include="DotNetEnv" Version="3.1.1" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1212
<PackageReference Include="Moq.Contrib.HttpClient" Version="1.4.0" />
13-
<PackageReference Include="Snapshooter.Xunit" Version="0.14.1" />
14-
<PackageReference Include="xunit" Version="2.9.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
13+
<PackageReference Include="Snapshooter.Xunit" Version="1.0.0" />
14+
<PackageReference Include="xunit" Version="2.9.3" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.2">
19+
<PackageReference Include="coverlet.collector" Version="6.0.3">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

dotnet/examples/VaasExample/VaasExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="GDataCyberDefense.Vaas" Version="7.6.1" />
12+
<PackageReference Include="GDataCyberDefense.Vaas" Version="7.6.2" />
1313
</ItemGroup>
1414

1515
</Project>

github-actions/cleanup-packages/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module GDATACyberDefense/cleanup-packages
33
go 1.22
44

55
require (
6-
github.com/docker/docker v27.3.1+incompatible
6+
github.com/docker/docker v27.5.1+incompatible
77
github.com/gofri/go-github-ratelimit v1.1.0
88
github.com/google/go-github/v66 v66.0.0
9-
github.com/google/go-github/v67 v67.0.0
9+
github.com/google/go-github/v68 v68.0.0
1010
)
1111

1212
require (

github-actions/cleanup-packages/go.sum

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
1212
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
1313
github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
1414
github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
15+
github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A=
16+
github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
17+
github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4=
18+
github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
19+
github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
20+
github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
21+
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
22+
github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1523
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
1624
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
1725
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -33,6 +41,7 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
3341
github.com/google/go-github/v66 v66.0.0 h1:ADJsaXj9UotwdgK8/iFZtv7MLc8E8WBl62WLd/D/9+M=
3442
github.com/google/go-github/v66 v66.0.0/go.mod h1:+4SO9Zkuyf8ytMj0csN1NR/5OTR+MfqPp8P8dVlcvY4=
3543
github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY=
44+
github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68=
3645
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
3746
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
3847
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

golang/vaas/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ require (
1818
github.com/klauspost/compress v1.17.9 // indirect
1919
github.com/kr/pretty v0.3.1 // indirect
2020
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
golang.org/x/crypto v0.24.0 // indirect
22-
golang.org/x/net v0.26.0 // indirect
23-
golang.org/x/sys v0.21.0 // indirect
24-
golang.org/x/text v0.16.0 // indirect
21+
golang.org/x/crypto v0.31.0 // indirect
22+
golang.org/x/net v0.33.0 // indirect
23+
golang.org/x/sys v0.28.0 // indirect
24+
golang.org/x/text v0.21.0 // indirect
2525
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)

0 commit comments

Comments
 (0)