opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 19:24:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

warn instead of error, lift logic to main.go

Browse Source 
Signed-off-by: Evan Miller <miller.evan815@gmail.com>
This commit is contained in:
Evan Miller
2025-07-02 18:20:35 -07:00
parent 4b1f7bcb9a
commit 31b4efcaec
12 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/quadlet/service-dynamicuser.build
View File

@ -1,4 +1,8 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Build]
ImageTag=localhost/imagename
SetWorkingDirectory=unit
[Service]
DynamicUser=foobar

5
test/e2e/quadlet/service-dynamicuser.container
View File

@ -1,4 +1,7 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Container]
Image=localhost/imagename
[Service]
DynamicUser=foobar

5
test/e2e/quadlet/service-dynamicuser.image
View File

@ -1,4 +1,7 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Image]
Image=localhost/imagename
[Service]
DynamicUser=foobar

5
test/e2e/quadlet/service-dynamicuser.kube
View File

@ -1,4 +1,7 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Kube]
Yaml=deployment.yml
[Service]
DynamicUser=foobar

1
test/e2e/quadlet/service-dynamicuser.network
View File

@ -1,4 +1,3 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Service]
DynamicUser=foobar

1
test/e2e/quadlet/service-dynamicuser.pod
View File

@ -1,4 +1,3 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Service]
DynamicUser=foobar

1
test/e2e/quadlet/service-dynamicuser.volume
View File

@ -1,4 +1,3 @@
## assert-failed
## assert-stderr-contains "using key DynamicUser in the Service group is not supported"
[Service]
DynamicUser=foobar

3
test/e2e/quadlet/service-group.container
View File

@ -1,7 +1,8 @@
## assert-failed
## assert-stderr-contains "using key Group in the Service group is not supported"
[Container]
Image=localhost/imagename
# This is fine
User=1000
Group=1000
[Service]

2
test/e2e/quadlet/service-user.container
View File

@ -1,6 +1,6 @@
## assert-failed
## assert-stderr-contains "using key User in the Service group is not supported"
[Container]
Image=localhost/imagename
# This is fine
User=1000

20
test/e2e/quadlet_test.go
View File

@ -1096,6 +1096,16 @@ BOGUS=foo
runWarningQuadletTestCase,
Entry("label-unsupported-escape.container", "label-unsupported-escape.container", "unsupported escape char"),
Entry("shortname.container", "shortname.container", "Warning: shortname.container specifies the image \"shortname\" which not a fully qualified image name. This is not ideal for performance and security reasons. See the podman-pull manpage discussion of short-name-aliases.conf for details."),
Entry("Unsupported Service Key - User", "service-user.container", "Warning: using key User in the Service group is not supported"),
Entry("Unsupported Service Key - Group", "service-group.container", "Warning: using key Group in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.build", "service-dynamicuser.build", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.container", "service-dynamicuser.container", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.image", "service-dynamicuser.image", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.kube", "service-dynamicuser.kube", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.network", "service-dynamicuser.network", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.pod", "service-dynamicuser.pod", "Warning: using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.volume", "service-dynamicuser.volume", "Warning: using key DynamicUser in the Service group is not supported"),
)
DescribeTable("Running expected error quadlet test case",
@ -1126,16 +1136,6 @@ BOGUS=foo
Entry("Build - Neither WorkingDirectory nor File Key", "neither-workingdirectory-nor-file.build", "converting \"neither-workingdirectory-nor-file.build\": neither SetWorkingDirectory, nor File key specified"),
Entry("Build - No ImageTag Key", "no-imagetag.build", "converting \"no-imagetag.build\": no ImageTag key specified"),
Entry("emptyline.container", "emptyline.container", "converting \"emptyline.container\": no Image or Rootfs key specified"),
Entry("Unsupported Service Key - User", "service-user.container", "converting \"service-user.container\": using key User in the Service group is not supported"),
Entry("Unsupported Service Key - Group", "service-group.container", "converting \"service-group.container\": using key Group in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.build", "service-dynamicuser.build", "converting \"service-dynamicuser.build\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.container", "service-dynamicuser.container", "converting \"service-dynamicuser.container\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.image", "service-dynamicuser.image", "converting \"service-dynamicuser.image\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.kube", "service-dynamicuser.kube", "converting \"service-dynamicuser.kube\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.network", "service-dynamicuser.network", "converting \"service-dynamicuser.network\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.pod", "service-dynamicuser.pod", "converting \"service-dynamicuser.pod\": using key DynamicUser in the Service group is not supported"),
Entry("Unsupported Service Key - DynamicUser.volume", "service-dynamicuser.volume", "converting \"service-dynamicuser.volume\": using key DynamicUser in the Service group is not supported"),
)
DescribeTable("Running success quadlet with ServiceName test case",