Skip to content

Commit

Permalink
Merge branch 'main' into PPANTT-46-add-maintenance-summary-api
Browse files Browse the repository at this point in the history
  • Loading branch information
alessio-cialini authored Jul 29, 2024
2 parents 1728f44 + 363bbd3 commit e18961c
Show file tree
Hide file tree
Showing 26 changed files with 132 additions and 58 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/anchore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the code
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Build the Docker image
run: |
echo ${{ secrets.GITHUB_TOKEN }} > ./secrets
DOCKER_BUILDKIT=1 docker build . --file ${{ env.DOCKERFILE }} --tag localbuild/testimage:latest --secret id=GH_TOKEN,src=./secrets
- name: Run the Anchore scan action itself with GitHub Advanced Security code scanning integration enabled
uses: anchore/scan-action@v3
uses: anchore/scan-action@3343887d815d7b07465f6fdcd395bd66508d486a # v3
with:
image: "localbuild/testimage:latest"
acs-report-enable: true
fail-build: true
severity-cutoff: "high"
- name: Upload Anchore Scan Report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@3e0e84636c6f5df46a2cb232ae1dd1384713150d # v2
if: always()
with:
sarif_file: results.sarif
10 changes: 5 additions & 5 deletions .github/workflows/check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- name: Assign Me
# You may pin to the exact commit or the version.
uses: kentaro-m/auto-assign-action@v1.2.1
uses: kentaro-m/auto-assign-action@746a3a558fdd0e061f612ec9f8ff1b8a19c1a115 # v1.2.1
with:
configuration-path: '.github/auto_assign.yml'

Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Formatting
id: format
Expand All @@ -43,7 +43,7 @@ jobs:
path: .
fail-on-changes: false

- uses: actions/github-script@v6.3.3
- uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # v6.3.3
if: steps.format.outcome != 'success'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -77,12 +77,12 @@ jobs:
runs-on: ubuntu-latest
name: Check Size
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
fetch-depth: 0

- name: Check Size
uses: actions/github-script@v6.3.3
uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # v6.3.3
env:
IGNORED_FILES: openapi.json, openapi-node.json
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Code Review
uses: pagopa/github-actions-template/maven-code-review@v1.10.4
uses: pagopa/github-actions-template/maven-code-review@5a544cfcc87edacde3391e4fb70228194f90ec63 # v1.10.4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
sonar_token: ${{ secrets.SONAR_TOKEN }}
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
if: ${{ always() }}
steps:
- name: Delete Previous deployments
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
env:
SHA_HEAD: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.sha) || github.sha}}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create_dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
persist-credentials: false

# from https://github.com/pagopa/opex-dashboard-azure-action/
- uses: pagopa/opex-dashboard-azure-action@v1.2.1
- uses: pagopa/opex-dashboard-azure-action@3ad80a5e4a2d5a8f342615637072f21b687320ce # v1.2.1
with:
environment: ${{ matrix.environment }}
api-name: ${{ matrix.product }}
Expand All @@ -56,7 +56,7 @@ jobs:
if: ${{ always() }}
steps:
- name: Delete Previous deployments
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
env:
SHA_HEAD: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.sha) || github.sha}}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
steps:
- name: Report Status
if: ${{ inputs.notify }}
uses: ravsamhq/notify-slack-action@v2
uses: ravsamhq/notify-slack-action@be814b201e233b2dc673608aa46e5447c8ab13f2 # v2
with:
status: ${{ needs.integration_test.result }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -87,7 +87,7 @@ jobs:
if: ${{ always() }}
steps:
- name: Delete Previous deployments
uses: actions/github-script@v6
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
env:
SHA_HEAD: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.sha) || github.sha}}
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
steps:
- name: Make Release
id: release
uses: pagopa/github-actions-template/maven-release@v1.5.4
uses: pagopa/github-actions-template/maven-release@d91a1fd0b913c9830589be5d86cdb71c90813fae # v1.5.4
with:
semver: ${{ needs.setup.outputs.semver }}
github_token: ${{ secrets.BOT_TOKEN_GITHUB }}
Expand All @@ -120,20 +120,20 @@ jobs:
# branch: ${{ github.ref_name}}
# github_token: ${{ secrets.GITHUB_TOKEN }}
# tag: ${{ needs.release.outputs.version }}
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
ref: ${{ github.ref_name }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v4.3.0
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 # v4.3.0
with:
images: ghcr.io/${{ github.repository }}
tags: |
Expand All @@ -143,7 +143,7 @@ jobs:
type=sha
- name: Build and push
uses: docker/build-push-action@v4
uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4
with:
context: .
push: true
Expand All @@ -169,7 +169,7 @@ jobs:
steps:
- name: Report Status
if: ${{ needs.setup.outputs.environment == 'prod' }}
uses: ravsamhq/notify-slack-action@v2
uses: ravsamhq/notify-slack-action@be814b201e233b2dc673608aa46e5447c8ab13f2 # v2
with:
status: ${{ needs.deploy_aks.result }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: ${{ contains(github.event.comment.body, 'update_code') }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
token: ${{ secrets.BOT_TOKEN_GITHUB }}

Expand All @@ -26,7 +26,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1
with:
java-version: 11

Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
if: ${{ always() && contains(needs.*.result, 'failure') }}
steps:
- name: Notify if Failure
uses: actions/github-script@v6.3.3
uses: actions/github-script@d556feaca394842dc55e4734bf3bb9f685482fa0 # v6.3.3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2

# prepare openapi template for infra repo
- run: |
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: core
description: APIs to manage configuration for CI and PSP of pagoPA
type: application
version: 0.155.0
appVersion: 0.59.2
version: 0.161.0
appVersion: 0.59.7
dependencies:
- name: microservice-chart
version: 2.8.0
Expand Down
2 changes: 1 addition & 1 deletion helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
envSecret: {}
image:
repository: ghcr.io/pagopa/pagopa-api-config
tag: "0.59.2"
tag: "0.59.7"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
envSecret: {}
image:
repository: ghcr.io/pagopa/pagopa-api-config
tag: "0.59.2"
tag: "0.59.7"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
envSecret: {}
image:
repository: ghcr.io/pagopa/pagopa-api-config
tag: "0.59.2"
tag: "0.59.7"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
28 changes: 23 additions & 5 deletions openapi/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"openapi": "3.0.1",
"info": {
"title": "core",
"description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
"description": "@project.description@",
"termsOfService": "https://www.pagopa.gov.it/",
"version": "0.59.2"
"version": "0.59.7"
},
"servers": [
{
Expand Down Expand Up @@ -18653,6 +18653,12 @@
},
"broadcast": {
"type": "boolean"
},
"aca": {
"type": "boolean"
},
"stand_in": {
"type": "boolean"
}
}
},
Expand Down Expand Up @@ -18857,7 +18863,7 @@
},
"config_description": {
"type": "string",
"example": " default millisecondi validità token"
"example": " default millisecondi validità token"
}
}
},
Expand Down Expand Up @@ -19423,7 +19429,7 @@
},
"config_description": {
"type": "string",
"example": " default millisecondi validità token"
"example": " default millisecondi validità token"
},
"config_category": {
"type": "string",
Expand Down Expand Up @@ -19600,6 +19606,12 @@
},
"broadcast": {
"type": "boolean"
},
"aca": {
"type": "boolean"
},
"stand_in": {
"type": "boolean"
}
}
},
Expand Down Expand Up @@ -20077,6 +20089,12 @@
},
"broadcast": {
"type": "boolean"
},
"aca": {
"type": "boolean"
},
"stand_in": {
"type": "boolean"
}
}
},
Expand Down Expand Up @@ -20678,4 +20696,4 @@
}
}
}
}
}
20 changes: 19 additions & 1 deletion openapi/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
"termsOfService": "https://www.pagopa.gov.it/",
"title": "core",
"version": "0.59.2"
"version": "0.59.7"
},
"host": "localhost:8080",
"basePath": "/",
Expand Down Expand Up @@ -15030,6 +15030,9 @@
},
"CreditorInstitutionStation": {
"properties": {
"aca": {
"type": "boolean"
},
"application_code": {
"format": "int64",
"minimum": 0,
Expand Down Expand Up @@ -15064,6 +15067,9 @@
"minimum": 0,
"type": "integer"
},
"stand_in": {
"type": "boolean"
},
"station_code": {
"example": "1234567890100",
"maxLength": 35,
Expand All @@ -15087,6 +15093,9 @@
},
"CreditorInstitutionStationEdit": {
"properties": {
"aca": {
"type": "boolean"
},
"application_code": {
"format": "int64",
"minimum": 0,
Expand Down Expand Up @@ -15116,6 +15125,9 @@
"minimum": 0,
"type": "integer"
},
"stand_in": {
"type": "boolean"
},
"station_code": {
"example": "1234567890100",
"maxLength": 35,
Expand Down Expand Up @@ -16103,6 +16115,9 @@
},
"StationCreditorInstitution": {
"properties": {
"aca": {
"type": "boolean"
},
"application_code": {
"format": "int64",
"type": "integer"
Expand Down Expand Up @@ -16137,6 +16152,9 @@
"segregation_code": {
"format": "int64",
"type": "integer"
},
"stand_in": {
"type": "boolean"
}
},
"required": [
Expand Down
Loading

0 comments on commit e18961c

Please sign in to comment.