Skip to content
This repository was archived by the owner on Sep 22, 2024. It is now read-only.

Commit e68b13e

Browse files
authored
Merge pull request #2 from dynatrace-api-framework/PAF-16_Verify_SSL_Option
PAF-16 Verify SSL option
2 parents 03009bd + 9be0494 commit e68b13e

File tree

6 files changed

+163
-17
lines changed

6 files changed

+163
-17
lines changed

Pipfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[[source]]
2+
name = "pypi"
3+
url = "https://pypi.org/simple"
4+
verify_ssl = true
5+
6+
[dev-packages]
7+
pylint = "*"
8+
9+
[packages]
10+
requests = "*"
11+
12+
[requires]
13+
python_version = "3.4"

Pipfile.lock

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dynatrace Python3 API Framework
22

3-
Testing the Dev Branch
3+
Testing the "Test" Branch
44

55
**Python Requirements**:
66
Requests
@@ -12,4 +12,4 @@ Python >= 3.4 (Built and tested with Python 3.8)
1212
1. Create user variable file in ./variable_sets in the format of template provided
1313
2. Run python change_variables.py and type in the name of the file (without ".py").
1414
It will copy over the new file as user_variables.py
15-
3. Create "sandbox_script.py" for trying out script or create your scripts in ./scripts
15+
3. Create "sandbox_script.py" for trying out script or create your scripts in ./scripts

change_variables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def replace_env():
77
print("Enter Set to Import: ", end='')
88
new_env = input()
99

10-
if "win" in sys.platform:
10+
if "windows" in sys.platform:
1111
os.system("copy variable_sets\\" + str(new_env) + ".py user_variables.py")
1212
else:
1313
os.system("cp variable_sets/" + str(new_env) + ".py user_variables.py")

dynatrace/requests/request_handler.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
1818
opened_adapters.add(self.get_adapter(url))
1919

2020
settings = OLD_MERGE_ENVIRONMENT_SETTINGS(self, url, proxies, stream, verify, cert)
21-
settings['verify'] = False
2221

2322
return settings
2423

@@ -74,11 +73,11 @@ def cluster_get(cluster, endpoint, params=None):
7473

7574
with no_ssl_verification():
7675
params['Api-Token'] = cluster['cluster_token']
77-
76+
7877
response = requests.get(
7978
"https://" + cluster['url'] + "/api/v1.0/onpremise/" + endpoint,
8079
params=params,
81-
verify=False
80+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
8281
)
8382
check_response(response)
8483
return response
@@ -100,7 +99,7 @@ def cluster_post(cluster, endpoint, params=None, json=None):
10099
"https://" + cluster['url'] + "/api/v1.0/onpremise/" + endpoint,
101100
params=params,
102101
json=json,
103-
verify=False
102+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
104103
)
105104
check_response(response)
106105
return response
@@ -121,7 +120,7 @@ def cluster_put(cluster, endpoint, params=None, json=None):
121120
"https://" + cluster['url'] + "/api/v1.0/onpremise/" + endpoint,
122121
params=params,
123122
json=json,
124-
verify=False
123+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
125124
)
126125
check_response(response)
127126
return response
@@ -141,7 +140,7 @@ def cluster_delete(cluster, endpoint, params=None, json=None):
141140
"https://" + cluster['url'] + "/api/v1.0/onpremise/" + endpoint,
142141
params=params,
143142
json=json,
144-
verify=False
143+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
145144
)
146145
check_response(response)
147146
return response
@@ -158,7 +157,7 @@ def env_get(cluster, tenant, endpoint, params=None):
158157
response = requests.get(
159158
generate_tenant_url(cluster, tenant) + "/api/v1/" + endpoint,
160159
params=params,
161-
verify=False
160+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
162161
)
163162
check_response(response)
164163
return response
@@ -176,7 +175,7 @@ def env_post(cluster, tenant, endpoint, params=None, json=None):
176175
response = requests.post(
177176
generate_tenant_url(cluster, tenant) + "/api/v1/" + endpoint,
178177
params=params,
179-
verify=False,
178+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
180179
json=json
181180
)
182181
check_response(response)
@@ -195,7 +194,7 @@ def env_put(cluster, tenant, endpoint, params=None, json=None):
195194
response = requests.put(
196195
generate_tenant_url(cluster, tenant) + "/api/v1/" + endpoint,
197196
params=params,
198-
verify=False,
197+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
199198
json=json
200199
)
201200
check_response(response)
@@ -213,7 +212,7 @@ def env_delete(cluster, tenant, endpoint, params=None):
213212
response = requests.delete(
214213
generate_tenant_url(cluster, tenant) + "/api/v1/" + endpoint,
215214
params=params,
216-
verify=False
215+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
217216
)
218217
check_response(response)
219218
return response
@@ -232,7 +231,7 @@ def config_get(cluster, tenant, endpoint, params=None, json=None):
232231
response = requests.get(
233232
generate_tenant_url(cluster, tenant) + "/api/config/v1/" + endpoint,
234233
params=params,
235-
verify=False,
234+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
236235
json=json
237236
)
238237
check_response(response)
@@ -251,7 +250,7 @@ def config_post(cluster, tenant, endpoint, params=None, json=None):
251250
response = requests.post(
252251
generate_tenant_url(cluster, tenant) + "/api/config/v1/" + endpoint,
253252
params=params,
254-
verify=False,
253+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
255254
json=json
256255
)
257256
check_response(response)
@@ -270,7 +269,7 @@ def config_put(cluster, tenant, endpoint, params=None, json=None):
270269
response = requests.put(
271270
generate_tenant_url(cluster, tenant) + "/api/config/v1/" + endpoint,
272271
params=params,
273-
verify=False,
272+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
274273
json=json
275274
)
276275
check_response(response)
@@ -289,7 +288,7 @@ def config_delete(cluster, tenant, endpoint, params=None, json=None):
289288
response = requests.delete(
290289
generate_tenant_url(cluster, tenant) + "/api/config/v1/" + endpoint,
291290
params=params,
292-
verify=False,
291+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
293292
json=json
294293
)
295294
check_response(response)

variable_sets/template.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"tenant2": "API TOKEN GOES HERE",
1212
},
1313
"is_managed": True,
14+
"verify_ssl": True,
1415
"cluster_token": "Required for Cluster Operations in Managed"
1516
}
1617
}

0 commit comments

Comments
 (0)