Skip to content

Commit

Permalink
review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmgaston
nmgaston committed Jan 10, 2024
1 parent 643edcf commit 2f5b3ec
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 22 deletions.
87 changes: 70 additions & 17 deletions docs/Manifest Parameters.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,59 @@ The query command can be used to gather information about the system and the Vis
</manifest>
```

#### Source Application Add Manifest Example (deb822 format)
```xml
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<type>source</type>
<applicationSource>
<repo>
<repos>
<source_pkg>Enabled: yes</source_pkg>
<source_pkg>Types: deb</source_pkg>
<source_pkg>URIs: http://dl.google.com/linux/chrome/deb/</source_pkg>
<source_pkg>Suites: stable</source_pkg>
<source_pkg>Components: main</source_pkg>
<source_pkg>Signed-By:</source_pkg>
<source_pkg> -----BEGIN PGP PUBLIC KEY BLOCK-----</source_pkg>
<source_pkg> Version: GnuPG v1.4.2.2 (GNU/Linux)</source_pkg>
<source_pkg> .</source_pkg>
<source_pkg> mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a</source_pkg>
<source_pkg> kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z</source_pkg>
<source_pkg> fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA</source_pkg>
<source_pkg> feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u</source_pkg>
<source_pkg> QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN</source_pkg>
<source_pkg> b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP</source_pkg>
<source_pkg> 78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X</source_pkg>
<source_pkg> 4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf</source_pkg>
<source_pkg> HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ</source_pkg>
<source_pkg> bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl</source_pkg>
<source_pkg> eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC</source_pkg>
<source_pkg> HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF</source_pkg>
<source_pkg> AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI</source_pkg>
<source_pkg> A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U</source_pkg>
<source_pkg> rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9</source_pkg>
<source_pkg> XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo</source_pkg>
<source_pkg> pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd</source_pkg>
<source_pkg> K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG</source_pkg>
<source_pkg> 2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm</source_pkg>
<source_pkg> CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9</source_pkg>
<source_pkg> KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn</source_pkg>
<source_pkg> cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT</source_pkg>
<source_pkg> G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki</source_pkg>
<source_pkg> 5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD</source_pkg>
<source_pkg> D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY</source_pkg>
<source_pkg> /FJG</source_pkg>
<source_pkg> %20=Quqp</source_pkg>
<source_pkg> -----END PGP PUBLIC KEY BLOCK-----</source_pkg>
</repos>
<filename>google-chrome.sources</filename>
</repo>
</add>
</applicationSource>
</manifest>
```

#### Source Application Update Manifest Parameters
| Tag | Example | Required/Optional | Notes |
|:-----------------------------------------|:-----------------------------------------------------------------------------------------------|:-----------------:|:------|
Expand Down Expand Up @@ -998,22 +1051,22 @@ The query command can be used to gather information about the system and the Vis
```

#### Source Application Remove Manifest Parameters
| Tag | Example | Required/Optional | Notes |
|:-----------------------------------------|:-----------------------------------------|:-----------------:|:------|
| `<?xml version='1.0' encoding='utf-8'?>` | `<?xml version='1.0' encoding='utf-8'?>` | R | |
| `<manifest>` | `<manifest>` | R | |
| `<type></type>` | `<type>source</type>` | R | |
| `<applicationSource>` | `<applicationSource>` | R | |
| `<remove>` | `<remove>` | R | |
| `<gpg>` | `<gpg>` | O | |
| `<keyname></keyname>` | `<keyname>google-chrome.gpg</keyname>` | O | |
| `</gpg>` | `<gpg>` | O | |
| `<repo>` | `<repo>` | R | |
| `<filename></filename>` | `<filename>google-chrom.list</filename>` | R | |
| `</repo>` | `</repo>` | R | |
| `</remove>` | `</remove>` | R | |
| `</applicationSource>` | `</applicationSource>` | R | |
| `</manifest>` | `</manifest>` | R | |
| Tag | Example | Required/Optional | Notes |
|:-----------------------------------------|:------------------------------------------|:-----------------:|:------|
| `<?xml version='1.0' encoding='utf-8'?>` | `<?xml version='1.0' encoding='utf-8'?>` | R | |
| `<manifest>` | `<manifest>` | R | |
| `<type></type>` | `<type>source</type>` | R | |
| `<applicationSource>` | `<applicationSource>` | R | |
| `<remove>` | `<remove>` | R | |
| `<gpg>` | `<gpg>` | O | |
| `<keyname></keyname>` | `<keyname>google-chrome.gpg</keyname>` | O | |
| `</gpg>` | `<gpg>` | O | |
| `<repo>` | `<repo>` | R | |
| `<filename></filename>` | `<filename>google-chrome.list</filename>` | R | |
| `</repo>` | `</repo>` | R | |
| `</remove>` | `</remove>` | R | |
| `</applicationSource>` | `</applicationSource>` | R | |
| `</manifest>` | `</manifest>` | R | |



Expand Down Expand Up @@ -1044,7 +1097,7 @@ The query command can be used to gather information about the system and the Vis
<applicationSource>
<remove>
<repo>
<filename>google-chrome.list</filename>
<filename>google-chrome.sources</filename>
</repo>
</remove>
</applicationSource>
Expand Down
4 changes: 2 additions & 2 deletions inbc-program/tests/unit/test_source_app_parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_create_add_deb_822_format_manifest_successfully(self, m_connect):
'URIs: https://dl-ssl.google.com/linux/linux_signing_key.pub',
'Suites: stable',
'Components: main',
'--filename', 'intel-gpu-jammy.list'])
'--filename', 'google-chrome.sources'])
Inbc(p, 'source', False)
expected = '<?xml version="1.0" encoding="utf-8"?><manifest><type>source</type><applicationSource>' \
'<add><repo><repos><source_pkg>X-Repolib-Name: Google Chrome</source_pkg>' \
Expand All @@ -91,7 +91,7 @@ def test_create_add_deb_822_format_manifest_successfully(self, m_connect):
'<source_pkg>URIs: https://dl-ssl.google.com/linux/linux_signing_key.pub</source_pkg>' \
'<source_pkg>Suites: stable</source_pkg>' \
'<source_pkg>Components: main</source_pkg>' \
'</repos><filename>intel-gpu-jammy.list</filename></repo></add></applicationSource></manifest>'
'</repos><filename>google-chrome.sources</filename></repo></add></applicationSource></manifest>'
self.assertEqual(p.func(p), expected)

@patch('inbm_lib.mqttclient.mqtt.mqtt.Client.connect')
Expand Down
4 changes: 2 additions & 2 deletions inbm/dispatcher-agent/fpm-template/usr/share/dispatcher-agent/manifest_schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
<xs:element name="repos" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="source_pkg" type="Max200Chars" minOccurs="1" maxOccurs="40"/>
<xs:element name="source_pkg" type="Max200Chars" minOccurs="1" maxOccurs="45"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand All @@ -353,7 +353,7 @@
<xs:element name="repos" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="source_pkg" type="Max200Chars" minOccurs="1" maxOccurs="10"/>
<xs:element name="source_pkg" type="Max200Chars" minOccurs="1" maxOccurs="45"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down
2 changes: 1 addition & 1 deletion inbm/dispatcher-agent/tests/unit/source/test_ubuntu_source_cmd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def test_add_app_with_gpg_key_successfully(self):
def test_add_app_deb_822_format_successfully(self):
try:
params = ApplicationAddSourceParameters(
file_name="intel-gpu-jammy.list",
file_name="google-chrome.sources",
sources="X-Repolib-Name: Google Chrome"
"Enabled: yes"
"Types: deb"
Expand Down

0 comments on commit 2f5b3ec

Please sign in to comment.