Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/add-mapping-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,9 @@ on:
type: boolean
default: false
jobs:
get-github-token:
name: Get GitHub Token
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
outputs:
github-token: ${{ steps.get-secrets.outputs.github-pat }}
steps:
- name: Authenticate with GCP
uses: google-github-actions/auth@v2
with:
workload_identity_provider: "projects/841522437311/locations/global/workloadIdentityPools/github-actions/providers/github-actions"
service_account: "terraform-infra@infrastructure-464010.iam.gserviceaccount.com"
create_credentials_file: true
export_environment_variables: true

- id: get-secrets
name: Get secrets from GCP Secret Manager
# This step retrieves secrets from GCP Secret Manager and sets them as outputs
# The secrets can then be accessed in subsequent steps using ${{ steps.get-secrets.outputs.<secret_name> }}
uses: "google-github-actions/get-secretmanager-secrets@v2"
with:
secrets: |-
github-pat:projects/626836145334/secrets/GITHUB_CI_PAT

add-mapping-version:
needs: get-github-token
uses: ./.github/workflows/call-add-mapping-version.yaml
with:
agent-version: ${{ github.event.inputs.agent-version }}
oss-version: ${{ github.event.inputs.oss-version }}
dry-run: ${{ github.event.inputs.dry-run }}
secrets:
github-token: ${{ needs.get-github-token.outputs.github-token }}
29 changes: 23 additions & 6 deletions .github/workflows/call-add-mapping-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,35 @@ on:
required: false
type: boolean
default: false
secrets:
github-token:
description: 'GitHub token for authentication'
jobs:
add-mapping-version:
name: Add Mapping Version ${{ inputs.agent-version }} --> ${{ inputs.oss-version }}
permissions:
contents: read
pull-requests: write
id-token: write
runs-on: ubuntu-latest
steps:
- name: Authenticate with GCP
uses: google-github-actions/auth@v2
with:
workload_identity_provider: "projects/841522437311/locations/global/workloadIdentityPools/github-actions/providers/github-actions"
service_account: "terraform-infra@infrastructure-464010.iam.gserviceaccount.com"

- id: get-secrets
name: Get secrets from GCP Secret Manager
# This step retrieves secrets from GCP Secret Manager and sets them as outputs
# The secrets can then be accessed in subsequent steps using ${{ steps.get-secrets.outputs.<secret_name> }}
uses: "google-github-actions/get-secretmanager-secrets@v2"
with:
secrets: |-
github-pat:projects/626836145334/secrets/GITHUB_CI_PAT

- name: Checkout repository
uses: actions/checkout@v4
with:
repository: fluentdo/documentation
token: ${{ secrets.github-token }}
token: ${{ steps.get-secrets.outputs.github-pat }}

- name: Add mapping version
run: |
Expand All @@ -49,7 +66,7 @@ jobs:
branch: ci_update-version-${{ inputs.agent-version }}
delete-branch: true
title: "ci: add mapping version for agent ${{ inputs.agent-version }}"
token: ${{ secrets.github-token }}
token: ${{ steps.get-secrets.outputs.github-pat }}
labels: ci,automerge
body: |
Mapping version added for FluentDo agent ${{ inputs.agent-version }}:
Expand All @@ -73,4 +90,4 @@ jobs:
# if: ${{ steps.cpr.outputs.pull-request-number }}
# run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
# env:
# GH_TOKEN: ${{ secrets.github-token }}
# GH_TOKEN: ${{ steps.get-secrets.outputs.github-pat }}