Skip to content

Commit dde4d51

Browse files
committed
Add verification failure behaviour param
1 parent 0455d3b commit dde4d51

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

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

+4
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

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

+4
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

Diff for: templates/aws-stack.yml

+12
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Metadata:
5252
- BuildkiteAgentSigningKeySSMParameter
5353
- BuildkiteAgentSigningKeyID
5454
- BuildkiteAgentVerificationKeySSMParameter
55+
- BuildkiteAgentVerificationFailureBehavior
5556

5657
- Label:
5758
default: Network Configuration
@@ -217,6 +218,15 @@ Parameters:
217218
AllowedPattern: "^$|^/[a-zA-Z0-9_.\\-/]+$"
218219
ConstraintDescription: "Expects a leading forward slash"
219220

221+
BuildkiteAgentVerificationFailureBehavior:
222+
Description: "How the agent should respond when a job signature fails verification"
223+
Type: String
224+
AllowedValues:
225+
- "block"
226+
- "warn"
227+
- ""
228+
Default: ""
229+
220230
BuildkiteAgentCancelGracePeriod:
221231
Description: The number of seconds a canceled or timed out job is given to gracefully terminate and upload its artifacts.
222232
Type: Number
@@ -1204,6 +1214,7 @@ Resources:
12041214
$Env:BUILDKITE_AGENT_SIGNING_KEY_PATH="${BuildkiteAgentSigningKeySSMParameter}"
12051215
$Env:BUILDKITE_AGENT_SIGNING_KEY_ID="${BuildkiteAgentSigningKeyID}"
12061216
$Env:BUILDKITE_AGENT_VERIFICATION_KEY_PATH="${BuildkiteAgentVerificationKeySSMParameter}"
1217+
$Env:BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR="${BuildkiteAgentVerificationFailureBehavior}"
12071218
$Env:BUILDKITE_AGENT_RELEASE="${BuildkiteAgentRelease}"
12081219
$Env:BUILDKITE_QUEUE="${BuildkiteQueue}"
12091220
$Env:BUILDKITE_AGENT_ENABLE_GIT_MIRRORS="${BuildkiteAgentEnableGitMirrors}"
@@ -1264,6 +1275,7 @@ Resources:
12641275
BUILDKITE_AGENT_SIGNING_KEY_PATH="${BuildkiteAgentSigningKeySSMParameter}" \
12651276
BUILDKITE_AGENT_SIGNING_KEY_ID="${BuildkiteAgentSigningKeyID}" \
12661277
BUILDKITE_AGENT_VERIFICATION_KEY_PATH="${BuildkiteAgentVerificationKeySSMParameter}" \
1278+
BUILDKITE_AGENT_VERIFICATION_FAILURE_BEHAVIOR="${BuildkiteAgentVerificationFailureBehavior}" \
12671279
BUILDKITE_AGENT_RELEASE="${BuildkiteAgentRelease}" \
12681280
BUILDKITE_AGENT_CANCEL_GRACE_PERIOD="${BuildkiteAgentCancelGracePeriod}" \
12691281
BUILDKITE_QUEUE="${BuildkiteQueue}" \

0 commit comments

Comments
 (0)