Skip to content

Commit e3b287b

Browse files
rfrandserfrandse
authored
Merge pull request #184 from geissonator/1120-detect-secrets
create detect-secrets baseline file + upstream rebase
2 parents 2d0b48d + 35034f3 commit e3b287b

File tree

21 files changed

+1214
-326
lines changed

21 files changed

+1214
-326
lines changed

‎.secrets.baseline‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"exclude": {
3+
"files": "^.secrets.baseline$",
4+
"lines": null
5+
},
6+
"generated_at": "2025-03-25T14:19:30Z",
7+
"plugins_used": [
8+
{
9+
"name": "AWSKeyDetector"
10+
},
11+
{
12+
"name": "ArtifactoryDetector"
13+
},
14+
{
15+
"name": "AzureStorageKeyDetector"
16+
},
17+
{
18+
"base64_limit": 4.5,
19+
"name": "Base64HighEntropyString"
20+
},
21+
{
22+
"name": "BasicAuthDetector"
23+
},
24+
{
25+
"name": "BoxDetector"
26+
},
27+
{
28+
"name": "CloudantDetector"
29+
},
30+
{
31+
"ghe_instance": "github.ibm.com",
32+
"name": "GheDetector"
33+
},
34+
{
35+
"name": "GitHubTokenDetector"
36+
},
37+
{
38+
"hex_limit": 3,
39+
"name": "HexHighEntropyString"
40+
},
41+
{
42+
"name": "IbmCloudIamDetector"
43+
},
44+
{
45+
"name": "IbmCosHmacDetector"
46+
},
47+
{
48+
"name": "JwtTokenDetector"
49+
},
50+
{
51+
"keyword_exclude": null,
52+
"name": "KeywordDetector"
53+
},
54+
{
55+
"name": "MailchimpDetector"
56+
},
57+
{
58+
"name": "NpmDetector"
59+
},
60+
{
61+
"name": "PrivateKeyDetector"
62+
},
63+
{
64+
"name": "SlackDetector"
65+
},
66+
{
67+
"name": "SoftlayerDetector"
68+
},
69+
{
70+
"name": "SquareOAuthDetector"
71+
},
72+
{
73+
"name": "StripeDetector"
74+
},
75+
{
76+
"name": "TwilioKeyDetector"
77+
}
78+
],
79+
"results": {},
80+
"version": "0.13.1+ibm.62.dss",
81+
"word_list": {
82+
"file": null,
83+
"hash": null
84+
}
85+
}

‎gen/meson.build‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ sdbuspp_gen_meson_ver = run_command(
33
sdbuspp_gen_meson_prog,
44
'--version',
55
check: true,
6-
).stdout().strip().split('\n')[0]
6+
).stdout().strip().split(
7+
'\n',
8+
)[0]
79

810
if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 10'
911
warning('Generated meson files from wrong version of sdbus++-gen-meson.')
1012
warning(
1113
'Expected "sdbus++-gen-meson version 10", got:',
12-
sdbuspp_gen_meson_ver
14+
sdbuspp_gen_meson_ver,
1315
)
1416
endif
1517

‎gen/regenerate-meson‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
22
cd "$(dirname "$0")" || exit
33
export PATH="$PWD/../subprojects/sdbusplus/tools:$PATH"
4-
exec sdbus++-gen-meson --command meson --directory ../yaml --output .
4+
sdbus++-gen-meson --command meson --directory ../yaml --output .
5+
find . -name "meson.build" -exec meson format -i {} +

‎gen/xyz/openbmc_project/Network/IP/Create/meson.build‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ generated_sources += custom_target(
1616
],
1717
depend_files: sdbusplusplus_depfiles,
1818
command: [
19-
sdbuspp_gen_meson_prog, '--command', 'cpp',
20-
'--output', meson.current_build_dir(),
21-
'--tool', sdbusplusplus_prog,
22-
'--directory', meson.current_source_dir() / '../../../../../../yaml',
19+
sdbuspp_gen_meson_prog,
20+
'--command',
21+
'cpp',
22+
'--output',
23+
meson.current_build_dir(),
24+
'--tool',
25+
sdbusplusplus_prog,
26+
'--directory',
27+
meson.current_source_dir() / '../../../../../../yaml',
2328
'xyz/openbmc_project/Network/IP/Create',
2429
],
2530
install: should_generate_cpp,

‎gen/xyz/openbmc_project/Network/IP/meson.build‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ sdbusplus_current_path = 'xyz/openbmc_project/Network/IP'
55

66
generated_markdown += custom_target(
77
'xyz/openbmc_project/Network/IP/Create__markdown'.underscorify(),
8-
input: [ '../../../../../yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
9-
output: [ 'Create.md' ],
8+
input: [
9+
'../../../../../yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml',
10+
],
11+
output: ['Create.md'],
1012
depend_files: sdbusplusplus_depfiles,
1113
command: [
12-
sdbuspp_gen_meson_prog, '--command', 'markdown',
13-
'--output', meson.current_build_dir(),
14-
'--tool', sdbusplusplus_prog,
15-
'--directory', meson.current_source_dir() / '../../../../../yaml',
14+
sdbuspp_gen_meson_prog,
15+
'--command',
16+
'markdown',
17+
'--output',
18+
meson.current_build_dir(),
19+
'--tool',
20+
sdbusplusplus_prog,
21+
'--directory',
22+
meson.current_source_dir() / '../../../../../yaml',
1623
'xyz/openbmc_project/Network/IP/Create',
1724
],
1825
install: should_generate_markdown,

‎gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ generated_sources += custom_target(
1616
],
1717
depend_files: sdbusplusplus_depfiles,
1818
command: [
19-
sdbuspp_gen_meson_prog, '--command', 'cpp',
20-
'--output', meson.current_build_dir(),
21-
'--tool', sdbusplusplus_prog,
22-
'--directory', meson.current_source_dir() / '../../../../../../yaml',
19+
sdbuspp_gen_meson_prog,
20+
'--command',
21+
'cpp',
22+
'--output',
23+
meson.current_build_dir(),
24+
'--tool',
25+
sdbusplusplus_prog,
26+
'--directory',
27+
meson.current_source_dir() / '../../../../../../yaml',
2328
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
2429
],
2530
install: should_generate_cpp,

‎gen/xyz/openbmc_project/Network/Neighbor/meson.build‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ sdbusplus_current_path = 'xyz/openbmc_project/Network/Neighbor'
55

66
generated_markdown += custom_target(
77
'xyz/openbmc_project/Network/Neighbor/CreateStatic__markdown'.underscorify(),
8-
input: [ '../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
9-
output: [ 'CreateStatic.md' ],
8+
input: [
9+
'../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml',
10+
],
11+
output: ['CreateStatic.md'],
1012
depend_files: sdbusplusplus_depfiles,
1113
command: [
12-
sdbuspp_gen_meson_prog, '--command', 'markdown',
13-
'--output', meson.current_build_dir(),
14-
'--tool', sdbusplusplus_prog,
15-
'--directory', meson.current_source_dir() / '../../../../../yaml',
14+
sdbuspp_gen_meson_prog,
15+
'--command',
16+
'markdown',
17+
'--output',
18+
meson.current_build_dir(),
19+
'--tool',
20+
sdbusplusplus_prog,
21+
'--directory',
22+
meson.current_source_dir() / '../../../../../yaml',
1623
'xyz/openbmc_project/Network/Neighbor/CreateStatic',
1724
],
1825
install: should_generate_markdown,

‎gen/xyz/openbmc_project/Network/VLAN/Create/meson.build‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ generated_sources += custom_target(
1616
],
1717
depend_files: sdbusplusplus_depfiles,
1818
command: [
19-
sdbuspp_gen_meson_prog, '--command', 'cpp',
20-
'--output', meson.current_build_dir(),
21-
'--tool', sdbusplusplus_prog,
22-
'--directory', meson.current_source_dir() / '../../../../../../yaml',
19+
sdbuspp_gen_meson_prog,
20+
'--command',
21+
'cpp',
22+
'--output',
23+
meson.current_build_dir(),
24+
'--tool',
25+
sdbusplusplus_prog,
26+
'--directory',
27+
meson.current_source_dir() / '../../../../../../yaml',
2328
'xyz/openbmc_project/Network/VLAN/Create',
2429
],
2530
install: should_generate_cpp,

‎gen/xyz/openbmc_project/Network/VLAN/meson.build‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ sdbusplus_current_path = 'xyz/openbmc_project/Network/VLAN'
55

66
generated_markdown += custom_target(
77
'xyz/openbmc_project/Network/VLAN/Create__markdown'.underscorify(),
8-
input: [ '../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
9-
output: [ 'Create.md' ],
8+
input: [
9+
'../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml',
10+
],
11+
output: ['Create.md'],
1012
depend_files: sdbusplusplus_depfiles,
1113
command: [
12-
sdbuspp_gen_meson_prog, '--command', 'markdown',
13-
'--output', meson.current_build_dir(),
14-
'--tool', sdbusplusplus_prog,
15-
'--directory', meson.current_source_dir() / '../../../../../yaml',
14+
sdbuspp_gen_meson_prog,
15+
'--command',
16+
'markdown',
17+
'--output',
18+
meson.current_build_dir(),
19+
'--tool',
20+
sdbusplusplus_prog,
21+
'--directory',
22+
meson.current_source_dir() / '../../../../../yaml',
1623
'xyz/openbmc_project/Network/VLAN/Create',
1724
],
1825
install: should_generate_markdown,

‎meson.build‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
project(
2-
'phosphor-networkd',
3-
'cpp',
4-
version: '0.1',
5-
meson_version: '>=1.1.1',
6-
default_options: [
7-
'warning_level=3',
8-
'cpp_std=c++23',
9-
])
2+
'phosphor-networkd',
3+
'cpp',
4+
version: '0.1',
5+
meson_version: '>=1.1.1',
6+
default_options: ['warning_level=3', 'cpp_std=c++23'],
7+
)
108

119
default_busname = 'xyz.openbmc_project.Network'
1210

1311
conf_data = configuration_data()
1412
conf_data.set_quoted('DEFAULT_BUSNAME', default_busname)
1513
conf_data.set('HAVE_UBOOT_ENV', get_option('uboot-env'))
1614
conf_data.set(
17-
'LINK_LOCAL_AUTOCONFIGURATION',
18-
get_option('default-link-local-autoconf'))
19-
conf_data.set(
20-
'ENABLE_IPV6_ACCEPT_RA',
21-
get_option('default-ipv6-accept-ra'))
15+
'LINK_LOCAL_AUTOCONFIGURATION',
16+
get_option('default-link-local-autoconf'),
17+
)
18+
conf_data.set('ENABLE_IPV6_ACCEPT_RA', get_option('default-ipv6-accept-ra'))
2219
conf_data.set('SYNC_MAC_FROM_INVENTORY', get_option('sync-mac'))
2320
conf_data.set('PERSIST_MAC', get_option('persist-mac'))
2421
conf_data.set10('FORCE_SYNC_MAC_FROM_INVENTORY', get_option('force-sync-mac'))
@@ -28,10 +25,12 @@ sdbusplusplus_prog = find_program('sdbus++', native: true)
2825
sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', native: true)
2926
sdbusplusplus_depfiles = files()
3027
if sdbusplus_dep.type_name() == 'internal'
31-
sdbusplusplus_depfiles = subproject('sdbusplus').get_variable('sdbusplusplus_depfiles')
28+
sdbusplusplus_depfiles = subproject('sdbusplus').get_variable(
29+
'sdbusplusplus_depfiles',
30+
)
3231
endif
3332

34-
yaml_selected_subdirs = [ 'xyz' ]
33+
yaml_selected_subdirs = ['xyz']
3534
should_generate_cpp = true
3635
should_generate_markdown = false
3736
should_generate_registry = false
@@ -40,17 +39,15 @@ networkd_dbus_includes = include_directories('gen')
4039

4140
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
4241

43-
networkd_dbus_deps = [
44-
phosphor_dbus_interfaces_dep,
45-
sdbusplus_dep,
46-
]
42+
networkd_dbus_deps = [phosphor_dbus_interfaces_dep, sdbusplus_dep]
4743

4844
networkd_dbus_lib = static_library(
49-
'networkd_dbus',
50-
generated_sources,
51-
implicit_include_directories: false,
52-
include_directories: networkd_dbus_includes,
53-
dependencies: networkd_dbus_deps)
45+
'networkd_dbus',
46+
generated_sources,
47+
implicit_include_directories: false,
48+
include_directories: networkd_dbus_includes,
49+
dependencies: networkd_dbus_deps,
50+
)
5451

5552
generated_files_headers = []
5653
foreach s : generated_sources
@@ -63,39 +60,41 @@ foreach s : generated_sources
6360
endforeach
6461

6562
networkd_dbus_dep = declare_dependency(
66-
sources: generated_files_headers,
67-
include_directories: networkd_dbus_includes,
68-
link_with: networkd_dbus_lib,
69-
dependencies: networkd_dbus_deps)
63+
sources: generated_files_headers,
64+
include_directories: networkd_dbus_includes,
65+
link_with: networkd_dbus_lib,
66+
dependencies: networkd_dbus_deps,
67+
)
7068

7169
subdir('src')
7270

7371
configure_file(
74-
input: '60-phosphor-networkd-default.network.in',
75-
output: '60-phosphor-networkd-default.network',
76-
configuration: conf_data,
77-
install: true,
78-
install_dir: dependency('systemd').get_variable(
79-
'systemdutildir') / 'network')
72+
input: '60-phosphor-networkd-default.network.in',
73+
output: '60-phosphor-networkd-default.network',
74+
configuration: conf_data,
75+
install: true,
76+
install_dir: dependency('systemd').get_variable('systemdutildir') / 'network',
77+
)
8078

8179
configure_file(
82-
input: 'xyz.openbmc_project.Network.service.in',
83-
output: 'xyz.openbmc_project.Network.service',
84-
configuration: {
85-
'SYSTEMD_TARGET': 'multi-user.target',
86-
'DEFAULT_BUSNAME': default_busname,
87-
},
88-
install: true,
89-
install_dir: dependency('systemd').get_variable(
90-
'systemdsystemunitdir'))
80+
input: 'xyz.openbmc_project.Network.service.in',
81+
output: 'xyz.openbmc_project.Network.service',
82+
configuration: {
83+
'SYSTEMD_TARGET': 'multi-user.target',
84+
'DEFAULT_BUSNAME': default_busname,
85+
},
86+
install: true,
87+
install_dir: dependency('systemd').get_variable('systemdsystemunitdir'),
88+
)
9189

9290
configure_file(
93-
input: 'xyz.openbmc_project.Network.conf.in',
94-
output: 'xyz.openbmc_project.Network.conf',
95-
configuration: {'DEFAULT_BUSNAME': default_busname},
96-
install: true,
97-
install_dir: get_option('datadir') / 'dbus-1' / 'system.d')
91+
input: 'xyz.openbmc_project.Network.conf.in',
92+
output: 'xyz.openbmc_project.Network.conf',
93+
configuration: {'DEFAULT_BUSNAME': default_busname},
94+
install: true,
95+
install_dir: get_option('datadir') / 'dbus-1' / 'system.d',
96+
)
9897

9998
if get_option('tests').allowed()
100-
subdir('test')
99+
subdir('test')
101100
endif

0 commit comments

Comments
 (0)