Skip to content

Commit 780d961

Browse files
ankushksinghfacebook-github-bot
authored andcommitted
Adding quotes for target, var and backend-config key value (#1399)
Summary: Pull Request resolved: #1399 **Context:** These are series of diffs for terraform wrappers. Terraform is used by deploy.sh to bring up the AWS/GCP infrastructure. **Change:** Adding terraform CLI options backend-config. target and var values in quotes **More context** One pager on the BE task: https://docs.google.com/document/d/19YnphIPaS_iZWdYQnUe9bb1Ob8Q0xy6fRDF3yACSZKU/edit?usp=sharing Reviewed By: marksliva Differential Revision: D38376283 fbshipit-source-id: 338e51d9e5b9b13022bc0a4a27e3a094649a7d54
1 parent bc59529 commit 780d961

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

fbpcs/infra/pce_deployment_library/deploy_library/terraform_library/terraform_deployment_utils.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ def add_dict_options(self, key: str, value: Dict[str, Any]) -> List[str]:
118118
t.get_command_list("terraform apply")
119119
120120
Returns:
121-
=> ['terraform', 'apply', '-backend-config region=us-west-2', '-backend-config access_key=fake_access_key']
121+
=> ['terraform', 'apply', '-backend-config "region=us-west-2"', '-backend-config "access_key=fake_access_key"']
122122
"""
123123
commands_list: List[str] = []
124-
commands_list.extend([f"-{key} {k}={v}" for k, v in value.items()])
124+
commands_list.extend([f'-{key} "{k}={v}"' for k, v in value.items()])
125125
return commands_list
126126

127127
def add_list_options(self, key: str, value: List[str]) -> List[str]:
@@ -132,11 +132,11 @@ def add_list_options(self, key: str, value: List[str]) -> List[str]:
132132
t.get_command_list("terraform apply")
133133
134134
Returns:
135-
=> ['terraform', 'apply', '-target=aws_s3_bucket_object.objects[2]', '-target=aws_s3_bucket_object.objects[3]']
135+
=> ['terraform', 'apply', '-target="aws_s3_bucket_object.objects[2]"', '-target="aws_s3_bucket_object.objects[3]"']
136136
"""
137137
commands_list: List[str] = []
138138
for val in value:
139-
commands_list.append(f"-{key}={val}")
139+
commands_list.append(f'-{key}="{val}"')
140140
return commands_list
141141

142142
def add_bool_options(self, key: str, value: bool) -> List[str]:
@@ -177,9 +177,9 @@ def add_other_options(self, key: str, value: str) -> List[str]:
177177
t.get_command_list("terraform init")
178178
179179
Returns:
180-
=> ['terraform', 'init', '-target=aws_s3_bucket_object.objects[2]']
180+
=> ['terraform', 'init', '-target="aws_s3_bucket_object.objects[2]"']
181181
"""
182182
commands_list: List[str] = []
183183
if value is not None:
184-
commands_list.append(f"-{key}={value}")
184+
commands_list.append(f'-{key}="{value}"')
185185
return commands_list

fbpcs/infra/pce_deployment_library/test/test_terraform_deployment.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_terraform_init(self) -> None:
9797
"region": "fake_region",
9898
"access_key": "fake_access_key",
9999
}
100-
expected_command = "terraform init -input=false -dry-run=true -backend-config region=fake_region -backend-config access_key=fake_access_key -reconfigure"
100+
expected_command = 'terraform init -input=false -dry-run=true -backend-config "region=fake_region" -backend-config "access_key=fake_access_key" -reconfigure'
101101
expected_value = RunCommandResult(
102102
return_code=0, output=f"Dry run command: {expected_command}", error=""
103103
)
@@ -111,7 +111,7 @@ def test_terraform_init(self) -> None:
111111
"region": "fake_region ",
112112
"access_key": "fake_access_key ",
113113
}
114-
expected_command = "terraform init -input=false -dry-run=true -backend-config region=fake_region -backend-config access_key=fake_access_key -reconfigure"
114+
expected_command = 'terraform init -input=false -dry-run=true -backend-config "region=fake_region " -backend-config "access_key=fake_access_key " -reconfigure'
115115
expected_value = RunCommandResult(
116116
return_code=0, output=f"Dry run command: {expected_command}", error=""
117117
)

0 commit comments

Comments
 (0)