Skip to content

Commit 4874261

Browse files
committed
Update for cis_report.py 3.0.1
1 parent 83c8138 commit 4874261

File tree

2 files changed

+7
-7
lines changed
  • security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard

2 files changed

+7
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
xlsxwriter>=3.2.0
1+
xlsxwriter>=3.2.5
22
pytz
33
pandas
44
openpyxl>=3.1.5
55
pyyaml>=6.0
6-
oci>=2.152.1
6+
oci>=2.1555.2
77
requests
88
matplotlib
99
numpy

security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard/scripts/cis_reports/cis_reports.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,7 +4137,7 @@ def __report_cis_analyze_tenancy_data(self):
41374137
"description": key['description'],
41384138
# "inactive_status": key['inactive_status'],
41394139
# "lifecycle_state": key['lifecycle_state'],
4140-
# "time_created": key['time_created'],
4140+
"time_created": key['time_created'],
41414141
# "time_expires": key['time_expires'],
41424142
# "token": key['token']
41434143
}
@@ -4148,7 +4148,7 @@ def __report_cis_analyze_tenancy_data(self):
41484148
# CIS Total 1.10 Adding - Keys to CIS Total
41494149
self.cis_foundations_benchmark_3_0['1.10']['Total'].append(
41504150
key)
4151-
# CIS 1.11 Check - Old DB Password
4151+
# CIS 1.11 Check - Old DB Password
41524152
#__iso_time_format1 = "%Y-%m-%dT%H:%M:%S.%fZ"
41534153
for user in self.__users:
41544154
if user['database_passwords']:
@@ -4161,6 +4161,7 @@ def __report_cis_analyze_tenancy_data(self):
41614161
"user_id": user['id'],
41624162
"id": key['ocid'],
41634163
"description": key['description'],
4164+
"time_created": key['time_created'],
41644165
# "expires-on": key['expires_on']
41654166
}
41664167

@@ -5355,7 +5356,7 @@ def __report_generate_cis_report(self, level):
53555356
summary_file_name = self.__print_to_json_file("cis", "summary_report", summary_report)
53565357
summary_files.append(summary_file_name)
53575358

5358-
summary_file_name = self.__report_generate_html_summary_report("cis", "html_summary_report", summary_report)
5359+
summary_file_name = self.__report_generate_html_summary_report("cis", "summary_report", summary_report)
53595360
summary_files.append(summary_file_name)
53605361

53615362
if OUTPUT_DIAGRAMS:
@@ -6425,8 +6426,7 @@ def execute_report():
64256426
for r, row in enumerate(reader):
64266427
for c, col in enumerate(row):
64276428
# Skipping the deep link due to formating errors in xlsx
6428-
if "=HYPERLINK" not in col:
6429-
worksheet.write(r, c, col)
6429+
worksheet.write(r, c, col)
64306430
worksheet.autofilter(0, 0, r - 1, c - 1)
64316431
worksheet.autofit()
64326432

0 commit comments

Comments
 (0)