Skip to content

(CAT-2624) Adjusting token logic #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gavindidrichsen merged 3 commits into from
Apr 30, 2026
Merged

(CAT-2624) Adjusting token logic #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ecc5e7
(CAT-2624) Adjusting token logic
LukasAud Apr 29, 2026
8e1984b
Adjusting restrictions
LukasAud Apr 29, 2026
31578c5
adjust DNS fixup command based on twingate installation
LukasAud Apr 30, 2026
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
31 changes: 24 additions & 7 deletions .github/workflows/module_acceptance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ on:
type: boolean


# ENABLE PUPPETCORE. The calling workflow must:
# - Set a valid PUPPET_FORGE_TOKEN secret on its repository.
env:
PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: "forge-key:${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}"
SERVICE_URL: ${{ inputs.service_url }}

jobs:
Expand All @@ -51,6 +47,15 @@ jobs:
- name: "Checkout"
uses: "actions/checkout@v4"

- name: "Configure forge authentication"
env:
FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
run: |
if [ -n "$FORGE_TOKEN" ]; then
echo "PUPPET_FORGE_TOKEN=$FORGE_TOKEN" >> $GITHUB_ENV
echo "BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM=forge-key:$FORGE_TOKEN" >> $GITHUB_ENV
fi

- name: "Setup ruby"
uses: "ruby/setup-ruby@v1"
with:
Expand Down Expand Up @@ -84,12 +89,23 @@ jobs:
TWINGATE_PUBLIC_REPO_KEY: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}

steps:
- name: "Configure forge authentication"
env:
FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
run: |
if [ -n "$FORGE_TOKEN" ]; then
echo "PUPPET_FORGE_TOKEN=$FORGE_TOKEN" >> $GITHUB_ENV
echo "BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM=forge-key:$FORGE_TOKEN" >> $GITHUB_ENV
fi

- name: "Install Twingate"
if: env.TWINGATE_PUBLIC_REPO_KEY != ''
uses: "twingate/github-action@v1"
with:
service-key: ${{ env.TWINGATE_PUBLIC_REPO_KEY }}

- name: Fix DNS
if: env.TWINGATE_PUBLIC_REPO_KEY != ''
run: |
echo "=== Remove Azure DNS from eth0 interface ==="
sudo resolvectl dns eth0 ""
Expand Down Expand Up @@ -140,11 +156,12 @@ jobs:
DOCKER_RUN_OPTS=''
fi
bundle exec rake "litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }},$DOCKER_RUN_OPTS]"
# Redact password
FILE='spec/fixtures/litmus_inventory.yaml'
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
# Clean up resolv.conf on target Docker machines to avoid Azure DNS issues caused by Twingate actions
bundle exec bolt command run "sed '/^nameserver 168.63.129.16\$/d; /^search/d' /etc/resolv.conf > /tmp/resolv.conf && cat /tmp/resolv.conf > /etc/resolv.conf" --targets all --inventoryfile spec/fixtures/litmus_inventory.yaml
if [[ -n "$TWINGATE_PUBLIC_REPO_KEY" ]]; then
bundle exec bolt command run "sed '/^nameserver 168.63.129.16\$/d; /^search/d' /etc/resolv.conf > /tmp/resolv.conf && cat /tmp/resolv.conf > /etc/resolv.conf" --targets all --inventoryfile spec/fixtures/litmus_inventory.yaml
fi


- name: "Install Puppet agent"
run: |
Expand Down
25 changes: 18 additions & 7 deletions .github/workflows/module_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ on:
default: ''
type: "string"

# ENABLE PUPPETCORE. The calling workflow must:
# - Set a valid PUPPET_FORGE_TOKEN secret on its repository.
# - Set ruby_version >= 3.1 to override this workflow's default 2.7; otherwise bundle install will fail.
env:
PUPPET_FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: "forge-key:${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}"

jobs:
setup_matrix:
name: "Setup Test Matrix"
Expand All @@ -58,6 +51,15 @@ jobs:
if: ${{ inputs.additional_packages != '' }}
run: sudo apt-get install -y ${{ inputs.additional_packages }}

- name: "Configure forge authentication"
env:
FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
run: |
if [ -n "$FORGE_TOKEN" ]; then
echo "PUPPET_FORGE_TOKEN=$FORGE_TOKEN" >> $GITHUB_ENV
echo "BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM=forge-key:$FORGE_TOKEN" >> $GITHUB_ENV
fi

- name: "Setup ruby"
uses: "ruby/setup-ruby@v1"
with:
Expand Down Expand Up @@ -98,6 +100,15 @@ jobs:
if: ${{ inputs.additional_packages != '' }}
run: sudo apt-get install -y ${{ inputs.additional_packages }}

- name: "Configure forge authentication"
env:
FORGE_TOKEN: ${{ secrets.PUPPET_FORGE_TOKEN || secrets.PUPPET_FORGE_TOKEN_PUBLIC }}
run: |
if [ -n "$FORGE_TOKEN" ]; then
echo "PUPPET_FORGE_TOKEN=$FORGE_TOKEN" >> $GITHUB_ENV
echo "BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM=forge-key:$FORGE_TOKEN" >> $GITHUB_ENV
fi

- name: "Setup ruby"
uses: "ruby/setup-ruby@v1"
with:
Expand Down
Loading