Skip to content

Commit f9ba206

Browse files
author
Steven Nemetz
committed
Fix default service logic
1 parent bf0a9a0 commit f9ba206

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

modules/pagerduty/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "datadog_default" {
22
description = "Default Pagerduty service for Datadog (@pagerduty)"
3-
default = false
3+
default = "False"
44
}
55

66
variable "service_key" {

src/pagerduty/lambda_lib.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
from __future__ import print_function
55
import boto3
6+
import distutils.util
67
import fnmatch
78
import json
89
import logging
@@ -131,9 +132,13 @@ def get_integration_parts(s3_bucket, prefix, pattern):
131132
if 'default' in part:
132133
default = part['default']
133134
part.pop('default', None)
134-
if default:
135-
parts.insert(0, part)
136-
else:
135+
logger.debug("Default value: '{}'".format(default))
136+
try:
137+
if distutils.util.strtobool(default):
138+
parts.insert(0, part)
139+
else:
140+
parts.append(part)
141+
except ValueError:
137142
parts.append(part)
138143
else:
139144
parts.append(part)

0 commit comments

Comments
 (0)