Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into PAGOPA-2256-pagopa-gp…
Browse files Browse the repository at this point in the history
…d-reporting-batch

# Conflicts:
#	.github/workflows/deploy.yml
  • Loading branch information
jacopocarlini committed Oct 21, 2024
2 parents 9b9d935 + 21aacfc commit d3f3bd2
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/anchore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ 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: docker build . --file ${{ env.DOCKERFILE }} --tag localbuild/testimage:latest

- 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@083cd45dc7d463f048a5d0975943f0e19e9c9378 # v2
if: always()
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/assignee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
steps:
- name: Assign Me
# You may pin to the exact commit or the version.
uses: kentaro-m/[email protected]
uses: kentaro-m/auto-assign-action@746a3a558fdd0e061f612ec9f8ff1b8a19c1a115 # v1.2.1
with:
configuration-path: '.github/auto_assign.yml'
4 changes: 2 additions & 2 deletions .github/workflows/check_metadata_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
steps:

- name: Verify PR Labels
uses: jesusvasquez333/[email protected]
uses: jesusvasquez333/verify-pr-label-action@657d111bbbe13e22bbd55870f1813c699bde1401 # v1.4.0
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
valid-labels: 'bug, enhancement, breaking-change, ignore-for-release'
pull-request-number: '${{ github.event.pull_request.number }}'

- name: Label Check
if: ${{ !contains(github.event.pull_request.labels.*.name, 'breaking-change') && !contains(github.event.pull_request.labels.*.name, 'enhancement') && !contains(github.event.pull_request.labels.*.name, 'bug') && !contains(github.event.pull_request.labels.*.name, 'ignore-for-release') }}
uses: actions/github-script@v3
uses: actions/github-script@ffc2c79a5b2490bd33e0a41c1de74b877714d736 # v3
with:
script: |
core.setFailed('Missing required labels')
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
steps:
- name: Report Status
if: always()
uses: ravsamhq/notify-slack-action@v2
uses: ravsamhq/notify-slack-action@be814b201e233b2dc673608aa46e5447c8ab13f2 # v2
with:
status: ${{ needs.integration_test.result }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/release_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
steps:
- name: Make Release
id: release
uses: pagopa/github-actions-template/[email protected]
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 @@ -111,23 +111,23 @@ jobs:
if: ${{ inputs.semver != 'skip' }}
environment: ${{ inputs.environment }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
with:
ref: ${{ needs.release.outputs.version }}

- name: Update WSDL Location
run: sh upd_wsdl_location.sh ${{ vars.NODO_HOST }}

- 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/[email protected]
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96 # v4.3.0
with:
images: ghcr.io/${{ github.repository }}
tags: |
Expand All @@ -137,7 +137,7 @@ jobs:
type=sha
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3
with:
context: .
push: true
Expand All @@ -153,17 +153,17 @@ jobs:
if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
steps:
- name: 'Checkout GitHub Action'
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: 'Login via Azure CLI'
uses: azure/login@v1
uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # v1
with:
client-id: ${{ secrets.CLIENT_ID }}
tenant-id: ${{ secrets.TENANT_ID }}
subscription-id: ${{ secrets.SUBSCRIPTION_ID }}

- name: 'Azure CLI script: start staging slot'
uses: azure/CLI@v1
uses: azure/CLI@4db43908b9df2e7ac93c8275a8f9a448c59338dd # v1
if: ${{ contains(github.event.inputs.environment, 'prod') }}
env:
ENV_SHORT: ${{ (contains(github.event.inputs.environment,'prod') && 'p') }}
Expand All @@ -172,7 +172,7 @@ jobs:
az functionapp start --name pagopa-${{ env.ENV_SHORT }}-weu-fn-gpd-batch --resource-group pagopa-${{ env.ENV_SHORT }}-weu-gps-gpd-rg --slot staging
- name: 'Run Azure Functions Container Action DEV|UAT: deploy on production slot'
uses: Azure/[email protected]
uses: Azure/functions-container-action@0aec6197033a72d3ca813f1aebd9391f639c2a8f # v1.2.1
if: ${{ contains(github.event.inputs.environment, 'dev') || contains(github.event.inputs.environment, 'uat') }}
env:
ENV_SHORT: ${{ (contains(github.event.inputs.environment,'dev') && 'd') || (contains(github.event.inputs.environment, 'uat') && 'u') }}
Expand All @@ -183,7 +183,7 @@ jobs:
slot-name: production

- name: 'Run Azure Functions Container Action PROD: deploy on staging slot'
uses: Azure/[email protected]
uses: Azure/functions-container-action@0aec6197033a72d3ca813f1aebd9391f639c2a8f # v1.2.1
if: ${{ contains(github.event.inputs.environment, 'prod') }}
env:
ENV_SHORT: ${{ (contains(github.event.inputs.environment,'prod') && 'p') }}
Expand All @@ -194,7 +194,7 @@ jobs:
slot-name: staging

- name: 'PROD Deploy Approval'
uses: trstringer/manual-approval@v1
uses: trstringer/manual-approval@662b3ddbc7685f897992051e87e1b4b58c07dc03 # v1
if: ${{ contains(github.event.inputs.environment, 'prod') }}
with:
secret: ${{ secrets.BOT_TOKEN_GITHUB }}
Expand All @@ -206,7 +206,7 @@ jobs:
timeout-minutes: 360

- name: 'Run Azure Functions Container Action PROD: deploy on production slot'
uses: Azure/[email protected]
uses: Azure/functions-container-action@0aec6197033a72d3ca813f1aebd9391f639c2a8f # v1.2.1
if: ${{ contains(github.event.inputs.environment, 'prod') }}
env:
ENV_SHORT: ${{ (contains(github.event.inputs.environment,'prod') && 'p') }}
Expand All @@ -217,7 +217,7 @@ jobs:
slot-name: production

- name: 'Azure CLI script: stop staging slot'
uses: azure/CLI@v1
uses: azure/CLI@4db43908b9df2e7ac93c8275a8f9a448c59338dd # v1
if: ${{ contains(github.event.inputs.environment, 'prod') }}
env:
ENV_SHORT: ${{ (contains(github.event.inputs.environment,'prod') && 'p') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Azure Pipelines Action - Jversion
uses: jacopocarlini/[email protected]
uses: jacopocarlini/azure-pipelines@b9721743a54e862597395b4a70727cfdc03028fb # v1.3
with:
azure-devops-project-url: https://dev.azure.com/pagopaspa/pagoPA-projects
azure-pipeline-name: 'pagopa-function-templat.code-review'
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: pagopa-functions-template
description: Microservice description
type: application
version: 0.24.0
appVersion: 0.1.12
version: 0.26.0
appVersion: 0.1.14
dependencies:
- name: microservice-chart
version: 1.21.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 @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: pagopadcommonacr.azurecr.io/pagopa<project-name> # TODO
tag: "0.1.12"
tag: "0.1.14"
pullPolicy: Always
# https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: pagopapcommonacr.azurecr.io/pagopa<project-name> # TODO
tag: "0.1.12"
tag: "0.1.14"
pullPolicy: Always
# https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: pagopaucommonacr.azurecr.io/pagopa<project-name> # TODO
tag: "0.1.12"
tag: "0.1.14"
pullPolicy: Always
# https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>it.gov.pagopa.reporting</groupId>
<artifactId>reporting-batch</artifactId>
<version>0.1.12</version>
<version>0.1.14</version>
<packaging>jar</packaging>

<name>Azure Reporting-Batch Fn</name>
Expand Down

0 comments on commit d3f3bd2

Please sign in to comment.