Skip to content

Commit 6dfef84

Browse files
committed
Add verification failure behaviour param
1 parent aff273b commit 6dfef84

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

packer/linux/conf/bin/bk-install-elastic-stack.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ if [[ -n "$BUILDKITE_AGENT_SIGNING_KEY_ID" ]]; then
314314
echo "signing-jwks-key-id=$BUILDKITE_AGENT_SIGNING_KEY_ID" >>/etc/buildkite-agent/buildkite-agent.cfg
315315
fi
316316

317+
if [[ -n "$BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR" ]]; then
318+
echo "verification-failure-behavior=$BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR" >>/etc/buildkite-agent/buildkite-agent.cfg
319+
fi
320+
317321
if [[ -n "$BUILDKITE_AGENT_VERIFICATION_KEY_PATH" ]]; then
318322
echo "Fetching signing key from ssm: $BUILDKITE_AGENT_VERIFICATION_KEY_PATH..."
319323

packer/windows/conf/bin/bk-install-elastic-stack.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ if (![string]::IsNullOrEmpty($Env:BUILDKITE_AGENT_SIGNING_KEY_ID)) {
168168
Add-Content -Path C:\buildkite-agent\buildkite-agent.cfg -Value "signing-jwks-key-id=$Env:BUILDKITE_AGENT_SIGNING_KEY_ID"
169169
}
170170

171+
if (![string]::IsNullOrEmpty($Env:BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR)) {
172+
Add-Content -Path C:\buildkite-agent\buildkite-agent.cfg -Value "verification-failure-behavior=$Env:BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR"
173+
}
174+
171175
if (![string]::IsNullOrEmpty($Env:BUILDKITE_AGENT_VERIFICATION_KEY_PATH)) {
172176
Write-Output "Fetching verification key from ssm: $Env:BUILDKITE_AGENT_VERIFICATION_KEY_PATH..."
173177

templates/aws-stack.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Metadata:
5353
- BuildkiteAgentSigningKeySSMParameter
5454
- BuildkiteAgentSigningKeyID
5555
- BuildkiteAgentVerificationKeySSMParameter
56+
- BuildkiteAgentVerificationFailureBehavior
5657

5758
- Label:
5859
default: Network Configuration
@@ -224,6 +225,15 @@ Parameters:
224225
AllowedPattern: "^$|^/[a-zA-Z0-9_.\\-/]+$"
225226
ConstraintDescription: "Expects a leading forward slash"
226227

228+
BuildkiteAgentVerificationFailureBehavior:
229+
Description: "How the agent should respond when a job signature fails verification"
230+
Type: String
231+
AllowedValues:
232+
- "block"
233+
- "warn"
234+
- ""
235+
Default: ""
236+
227237
BuildkiteAgentCancelGracePeriod:
228238
Description: The number of seconds a canceled or timed out job is given to gracefully terminate and upload its artifacts.
229239
Type: Number
@@ -1243,6 +1253,7 @@ Resources:
12431253
$Env:BUILDKITE_AGENT_SIGNING_KEY_PATH="${BuildkiteAgentSigningKeySSMParameter}"
12441254
$Env:BUILDKITE_AGENT_SIGNING_KEY_ID="${BuildkiteAgentSigningKeyID}"
12451255
$Env:BUILDKITE_AGENT_VERIFICATION_KEY_PATH="${BuildkiteAgentVerificationKeySSMParameter}"
1256+
$Env:BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR="${BuildkiteAgentVerificationFailureBehavior}"
12461257
$Env:BUILDKITE_AGENT_RELEASE="${BuildkiteAgentRelease}"
12471258
$Env:BUILDKITE_QUEUE="${BuildkiteQueue}"
12481259
$Env:BUILDKITE_AGENT_ENABLE_GIT_MIRRORS="${BuildkiteAgentEnableGitMirrors}"
@@ -1304,6 +1315,7 @@ Resources:
13041315
BUILDKITE_AGENT_SIGNING_KEY_PATH="${BuildkiteAgentSigningKeySSMParameter}" \
13051316
BUILDKITE_AGENT_SIGNING_KEY_ID="${BuildkiteAgentSigningKeyID}" \
13061317
BUILDKITE_AGENT_VERIFICATION_KEY_PATH="${BuildkiteAgentVerificationKeySSMParameter}" \
1318+
BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR="${BuildkiteAgentVerificationFailureBehavior}" \
13071319
BUILDKITE_AGENT_RELEASE="${BuildkiteAgentRelease}" \
13081320
BUILDKITE_AGENT_CANCEL_GRACE_PERIOD="${BuildkiteAgentCancelGracePeriod}" \
13091321
BUILDKITE_QUEUE="${BuildkiteQueue}" \

0 commit comments

Comments
 (0)