@@ -2155,7 +2155,7 @@ finalize() {
2155
2155
2156
2156
2157
2157
# ##############################################################################
2158
- # Remove secret from pipeline inout and output result to pipeline.
2158
+ # Remove secret from pipeline input and output result to pipeline.
2159
2159
# Globals:
2160
2160
# None
2161
2161
# Arguments:
@@ -2168,6 +2168,18 @@ remove_secret_from_config_db_dump() {
2168
2168
sed -E ' s/\"passkey\"\s*:\s*\"([^\"]*)\"/\"passkey\":\"****\"/g; /SNMP_COMMUNITY/,/\s{2,4}\},/d'
2169
2169
}
2170
2170
2171
+
2172
+ # ##############################################################################
2173
+ # Remove secret from file.
2174
+ # ##############################################################################
2175
+ remove_secret_from_config_db_dump_file () {
2176
+ local dumpfile=$1
2177
+ if [ -e ${dumpfile} ]; then
2178
+ cat $dumpfile | remove_secret_from_config_db_dump > $dumpfile .temp
2179
+ mv $dumpfile .temp $dumpfile
2180
+ fi
2181
+ }
2182
+
2171
2183
# ##############################################################################
2172
2184
# Remove secret from dump files.
2173
2185
# Globals:
@@ -2201,8 +2213,24 @@ remove_secret_from_etc_files() {
2201
2213
sed -i -E ' s/(\s*snmp_\S*community\s*:\s*)(\S*)/\1****/g' $dumppath /etc/sonic/snmp.yml
2202
2214
2203
2215
# Remove secret from /etc/sonic/config_db.json
2204
- cat $dumppath /etc/sonic/config_db.json | remove_secret_from_config_db_dump > $dumppath /etc/sonic/config_db.json.temp
2205
- mv $dumppath /etc/sonic/config_db.json.temp $dumppath /etc/sonic/config_db.json
2216
+ remove_secret_from_config_db_dump_file $dumppath /etc/sonic/config_db.json
2217
+
2218
+ # Remove secret from /etc/sonic/golden_config_db.json
2219
+ remove_secret_from_config_db_dump_file $dumppath /etc/sonic/golden_config_db.json
2220
+
2221
+ # Remove secret from /etc/sonic/old_config/
2222
+
2223
+ # Remove snmp community string from old_config/snmp.yml
2224
+ local oldsnmp=${dumppath} /etc/sonic/old_config/snmp.yml
2225
+ if [ -e ${oldsnmp} ]; then
2226
+ sed -i -E ' s/(\s*snmp_\S*community\s*:\s*)(\S*)/\1****/g' $oldsnmp
2227
+ fi
2228
+
2229
+ # Remove secret from /etc/sonic/config_db.json
2230
+ remove_secret_from_config_db_dump_file ${dumppath} /etc/sonic/old_config/config_db.json
2231
+
2232
+ # Remove secret from /etc/sonic/golden_config_db.json
2233
+ remove_secret_from_config_db_dump_file ${dumppath} /etc/sonic/old_config/golden_config_db.json
2206
2234
}
2207
2235
2208
2236
# ##############################################################################
0 commit comments