Skip to content

Commit f393725

Browse files
author
Steven Nemetz
committed
Fix default
1 parent 55db1fa commit f393725

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

examples/pagerduty-svc1/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ module "service" {
33
service_key = "1234567890"
44
service_name = "testing_tf"
55
s3_bucket = "wiser-infra-automation"
6-
datadog_default = "false"
6+
datadog_default = ""
77
}

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 = ""
44
}
55

66
variable "service_key" {

src/pagerduty/lambda_lib.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,11 @@ def get_integration_parts(s3_bucket, prefix, pattern):
133133
default = part['default']
134134
part.pop('default', None)
135135
logger.debug("Default value: '{}'".format(default))
136-
# if default: # All True
137-
# strtobool: All false or fail
138-
try:
139-
if distutils.util.strtobool(default):
140-
logger.debug("Default service")
141-
parts.insert(0, part)
142-
else:
143-
logger.debug("NOT Default service: false value")
144-
parts.append(part)
145-
# except ValueError: AttributeError
146-
except:
147-
logger.debug("NOT Default service: strtobool exception")
136+
if default:
137+
logger.debug("Default service: true value")
138+
parts.insert(0, part)
139+
else:
140+
logger.debug("NOT Default service: false value")
148141
parts.append(part)
149142
else:
150143
logger.debug("NOT Default service: No default key")

0 commit comments

Comments
 (0)