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

Commit 0319e75

Browse files
authored
Merge pull request #5 from dynatrace-api-framework/dev
Bring missing Pipfiles to Branch
2 parents 6b88cc6 + e68b13e commit 0319e75

File tree

6 files changed

+163
-17
lines changed

6 files changed

+163
-17
lines changed

Pipfile

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

+133
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

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

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

+13-14
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def merge_environment_settings(self, url, proxies, stream, verify, cert):
2323
opened_adapters.add(self.get_adapter(url))
2424

2525
settings = OLD_MERGE_ENVIRONMENT_SETTINGS(self, url, proxies, stream, verify, cert)
26-
settings['verify'] = False
2726

2827
return settings
2928

@@ -79,11 +78,11 @@ def cluster_get(cluster, endpoint, params=None):
7978

8079
with no_ssl_verification():
8180
params['Api-Token'] = cluster['cluster_token']
82-
81+
8382
response = requests.get(
8483
HTTPS_STR + cluster['url'] + CLUSTER_V1_PATH + endpoint,
8584
params=params,
86-
verify=False
85+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
8786
)
8887
check_response(response)
8988
return response
@@ -105,7 +104,7 @@ def cluster_post(cluster, endpoint, params=None, json=None):
105104
HTTPS_STR + cluster['url'] + CLUSTER_V1_PATH + endpoint,
106105
params=params,
107106
json=json,
108-
verify=False
107+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
109108
)
110109
check_response(response)
111110
return response
@@ -126,7 +125,7 @@ def cluster_put(cluster, endpoint, params=None, json=None):
126125
HTTPS_STR + cluster['url'] + CLUSTER_V1_PATH + endpoint,
127126
params=params,
128127
json=json,
129-
verify=False
128+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
130129
)
131130
check_response(response)
132131
return response
@@ -146,7 +145,7 @@ def cluster_delete(cluster, endpoint, params=None, json=None):
146145
HTTPS_STR + cluster['url'] + CLUSTER_V1_PATH + endpoint,
147146
params=params,
148147
json=json,
149-
verify=False
148+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
150149
)
151150
check_response(response)
152151
return response
@@ -163,7 +162,7 @@ def env_get(cluster, tenant, endpoint, params=None):
163162
response = requests.get(
164163
generate_tenant_url(cluster, tenant) + ENV_API_V1 + endpoint,
165164
params=params,
166-
verify=False
165+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
167166
)
168167
check_response(response)
169168
return response
@@ -181,7 +180,7 @@ def env_post(cluster, tenant, endpoint, params=None, json=None):
181180
response = requests.post(
182181
generate_tenant_url(cluster, tenant) + ENV_API_V1 + endpoint,
183182
params=params,
184-
verify=False,
183+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
185184
json=json
186185
)
187186
check_response(response)
@@ -200,7 +199,7 @@ def env_put(cluster, tenant, endpoint, params=None, json=None):
200199
response = requests.put(
201200
generate_tenant_url(cluster, tenant) + ENV_API_V1 + endpoint,
202201
params=params,
203-
verify=False,
202+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
204203
json=json
205204
)
206205
check_response(response)
@@ -218,7 +217,7 @@ def env_delete(cluster, tenant, endpoint, params=None):
218217
response = requests.delete(
219218
generate_tenant_url(cluster, tenant) + ENV_API_V1 + endpoint,
220219
params=params,
221-
verify=False
220+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"])
222221
)
223222
check_response(response)
224223
return response
@@ -237,7 +236,7 @@ def config_get(cluster, tenant, endpoint, params=None, json=None):
237236
response = requests.get(
238237
generate_tenant_url(cluster, tenant) + CONFIG_API_V1 + endpoint,
239238
params=params,
240-
verify=False,
239+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
241240
json=json
242241
)
243242
check_response(response)
@@ -256,7 +255,7 @@ def config_post(cluster, tenant, endpoint, params=None, json=None):
256255
response = requests.post(
257256
generate_tenant_url(cluster, tenant) + CONFIG_API_V1 + endpoint,
258257
params=params,
259-
verify=False,
258+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
260259
json=json
261260
)
262261
check_response(response)
@@ -275,7 +274,7 @@ def config_put(cluster, tenant, endpoint, params=None, json=None):
275274
response = requests.put(
276275
generate_tenant_url(cluster, tenant) + CONFIG_API_V1 + endpoint,
277276
params=params,
278-
verify=False,
277+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
279278
json=json
280279
)
281280
check_response(response)
@@ -294,7 +293,7 @@ def config_delete(cluster, tenant, endpoint, params=None, json=None):
294293
response = requests.delete(
295294
generate_tenant_url(cluster, tenant) + CONFIG_API_V1 + endpoint,
296295
params=params,
297-
verify=False,
296+
verify=(True if "verify_ssl" not in cluster else cluster ["verify_ssl"]),
298297
json=json
299298
)
300299
check_response(response)

variable_sets/template.py

+1
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)