Merge branch 'main' into gmp-doc-get-credentials-details

greenbone · Jul 11, 2024 · 7ae3df0 · 7ae3df0
2 parents e6fd780 + 4bafd54
commit 7ae3df0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and push Container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'main') }}

diff --git a/src/schema_formats/XML/GMP.xml.in b/src/schema_formats/XML/GMP.xml.in
@@ -10760,11 +10760,13 @@ END:VCALENDAR
           <o><e>certificate_info</e></o>
           <o><e>scanners</e></o>
           <o><e>targets</e></o>
-          <or>
-            <e>public_key</e>
-            <e>package</e>
-            <e>certificate</e>
-          </or>
+          <o>
+            <or>
+              <e>public_key</e>
+              <e>package</e>
+              <e>certificate</e>
+            </or>
+          </o>
         </pattern>
         <ele>
           <name>owner</name>
@@ -11347,7 +11349,7 @@ END:VCALENDAR
     <pattern>
       <attrib>
         <name>type</name>
-        <summary>Type of single feed to get: NVT, CERT or SCAP</summary>
+        <summary>Type of single feed to get: NVT, CERT, SCAP or GVMD_DATA</summary>
         <type>text</type>
       </attrib>
     </pattern>
@@ -11377,7 +11379,7 @@ END:VCALENDAR
         </pattern>
         <ele>
           <name>type</name>
-          <summary>The type of feed: NVT, CERT or SCAP</summary>
+          <summary>The type of feed: NVT, CERT, SCAP or GVMD_DATA</summary>
           <pattern>text</pattern>
         </ele>
         <ele>
@@ -11411,18 +11413,12 @@ END:VCALENDAR
           <summary>Present if a sync of this type is underway</summary>
           <pattern>
             <e>timestamp</e>
-            <e>user</e>
           </pattern>
           <ele>
             <name>timestamp</name>
             <summary>Time sync started</summary>
             <pattern>text</pattern>
           </ele>
-          <ele>
-            <name>user</name>
-            <summary>Name of user who is performing sync</summary>
-            <pattern>text</pattern>
-          </ele>
         </ele>
       </ele>
     </response>