Skip to content

Commit 25c9f1f

Browse files
authored
Merge pull request #111 from oracle-devrel/develop-temp
Develop temp
2 parents 451c552 + e60afc8 commit 25c9f1f

File tree

5 files changed

+30
-11
lines changed

5 files changed

+30
-11
lines changed

README.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Additionally, the toolkit also supports seamless resource management using OCI D
3030

3131
<tr>
3232
<td>IAM/Identity</td>
33-
<td>Governance</td>
34-
<td>Policy Enforcement using OPA</td>
33+
<td>Tagging</td>
34+
<td>Quotas</td>
3535
</tr>
3636
<tr>
3737
<td>Network</td>
@@ -40,21 +40,30 @@ Additionally, the toolkit also supports seamless resource management using OCI D
4040
</tr>
4141
<tr>
4242
<td>OCI Network Firewall</td>
43-
<td>SDDCs</td>
44-
<td>CIS Landing Zone<br>Compliance</td>
43+
<td>KMS</td>
44+
<td>Policy Enforcement using OPA</td>
45+
4546
</tr>
4647
<tr>
4748
<td>Compute</td>
4849
<td>Storage</td>
4950
<td>Database</td>
5051
</tr>
5152
<tr>
52-
<td>Developer Services</td>
53-
<td>Logging Services</td>
54-
<td>Observability and Management</td>
53+
<td>OKE</td>
54+
<td>Resource Manager</td>
55+
<td>SDDCs</td>
5556
</tr>
5657
<tr>
57-
58+
<td>Logging Services</td>
59+
<td>Monitoring</td>
60+
<td>Budgets</td>
61+
</tr>
62+
<tr>
63+
<td>Cloud Guard</td>
64+
<td>SHOWOCI report</td>
65+
<td>CIS Landing Zone<br>Compliance</td>
66+
5867
</tr>
5968
</table>
6069
</tr>

cd3_automation_toolkit/DeveloperServices/ResourceManager/create_resource_manager_stack.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
150150
try:
151151
with open(region_dir + '/variables_' + region + '.tf') as origfile, open(rm_dir + '/variables_' + region + '.tf', 'w') as newfile:
152152
for line in origfile:
153+
if 'gateway_route_table = optional(bool,false)' in line:
154+
line = line.replace('gateway_route_table = optional(bool,false)','gateway_route_table = optional(bool)')
155+
if 'default_route_table = optional(bool,false)' in line:
156+
line = line.replace('default_route_table = optional(bool,false)','default_route_table = optional(bool)')
153157
if "user_ocid" in line or "fingerprint" in line or "private_key_path" in line:
154158
skipline = True
155159
if not skipline:
@@ -181,6 +185,12 @@ def create_resource_manager(outdir,var_file, outdir_struct,prefix,auth_mechanism
181185
try:
182186
with open(region_dir+'/'+service_dir+'/variables_' + region + '.tf') as origfile, open(rm_dir + '/'+ service_dir +'/variables_' + region + '.tf','w') as newfile:
183187
for line in origfile:
188+
if 'gateway_route_table = optional(bool,false)' in line:
189+
line = line.replace('gateway_route_table = optional(bool,false)',
190+
'gateway_route_table = optional(bool)')
191+
if 'default_route_table = optional(bool,false)' in line:
192+
line = line.replace('default_route_table = optional(bool,false)',
193+
'default_route_table = optional(bool)')
184194
if "user_ocid" in line or "fingerprint" in line or "private_key_path" in line:
185195
skipline = True
186196
if not skipline:

cd3_automation_toolkit/Identity/Users/export_users_nonGreenField.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def export_users(inputfile, outdir, service_dir, config, signer, ct):
169169
values_for_column_users[col_header].append("")
170170

171171
commonTools.write_to_cd3(values_for_column_users, cd3file, sheetName_users)
172-
print("{0} Users exported into CD3.\n".format(len(values_for_column_groups["Region"])))
172+
print("{0} Users exported into CD3.\n".format(len(values_for_column_users["Region"])))
173173

174174
with open(script_file, 'a') as importCommands[ct.home_region]:
175175
importCommands[ct.home_region].write('\n\nterraform plan\n')

cd3_automation_toolkit/Storage/FileSystem/export_fss_nonGreenField.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def __get_mount_info(cname, ntk_compartment_ids, compartment_id, reg, availabili
337337
mnt_p_ip = v['ip']
338338
mnt_p_hostname = v['hostname']
339339
nsg_names = v['nsg']
340-
add_column_data(reg, cname, AD_name, mt_display_name, vplussubnet, mnt_p_ip, mnt_p_hostname, "","", "", "", "", "", "","", "", "", "", "", "","", "", "", fsinfo=None, values_for_column_fss=values_for_column_fss, mnt_info1=None, nsg_n=nsg_names)
340+
add_column_data(reg, cname, AD_name, mt_display_name, vplussubnet, mnt_p_ip, mnt_p_hostname, "","", "", "", "", "", "","", "", "", "", "", "","", "", "", fsinfo=file_system_info_1, values_for_column_fss=values_for_column_fss, mnt_info1=None, nsg_n=nsg_names)
341341

342342
except Exception as e:
343343
pass

cd3_automation_toolkit/cd3Validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ def validate_cd3(choices, filename, var_file, prefix, outdir, ct1): #config1, si
19461946
val_net=True
19471947

19481948
log("\n============================= Verifying VCNs Tab ==========================================\n")
1949-
log("\n====================== Note: LPGs will npt be verified ====================================\n")
1949+
log("\n====================== Note: LPGs will not be verified ====================================\n")
19501950
print("\nProcessing VCNs Tab..")
19511951
print("NOTE: LPGs will not be verified")
19521952
vcn_check, vcn_cidr_check, vcn_peer_check = validate_vcns(filename, ct.ntk_compartment_ids, vcnobj) #, config)

0 commit comments

Comments
 (0)