secret: add support for `--ignore` with rm

Signed-off-by: danishprakash <danish.prakash@suse.com>

cmd/podman/secrets/rm.go

@@ -29,6 +29,7 @@ func init() {
 	})
 	flags := rmCmd.Flags()
 	flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all secrets")
+	flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified secret is missing")
 }
 
 var (

docs/source/markdown/podman-secret-rm.1.md

@@ -26,6 +26,9 @@ Remove all existing secrets.
 
 Print usage statement.
 
+#### **--ignore**, **-i**
+Ignore errors when specified secrets are not present.
+
 ## EXAMPLES
 
 ```

pkg/domain/entities/secrets.go

@@ -34,7 +34,8 @@ type SecretListReport struct {
 }
 
 type SecretRmOptions struct {
-	All bool
+	All    bool
+	Ignore bool
 }
 
 type SecretRmReport struct {

pkg/domain/infra/abi/secrets.go

@@ -167,10 +167,12 @@ func (ic *ContainerEngine) SecretRm(ctx context.Context, nameOrIDs []string, opt
 	for _, nameOrID := range toRemove {
 		deletedID, err := manager.Delete(nameOrID)
 		if err == nil || strings.Contains(err.Error(), "no such secret") {
-			reports = append(reports, &entities.SecretRmReport{
+			if !options.Ignore {
-				Err: err,
+				reports = append(reports, &entities.SecretRmReport{
-				ID:  deletedID,
+					Err: err,
-			})
+					ID:  deletedID,
+				})
+			}
 			continue
 		} else {
 			return nil, err

pkg/domain/infra/tunnel/secrets.go

@@ -77,10 +77,12 @@ func (ic *ContainerEngine) SecretRm(ctx context.Context, nameOrIDs []string, opt
 				return nil, err
 			}
 			if errModel.ResponseCode == 404 {
-				allRm = append(allRm, &entities.SecretRmReport{
+				if !options.Ignore {
-					Err: fmt.Errorf("no secret with name or id %q: no such secret ", name),
+					allRm = append(allRm, &entities.SecretRmReport{
-					ID:  "",
+						Err: fmt.Errorf("no secret with name or id %q: no such secret ", name),
-				})
+						ID:  "",
+					})
+				}
 				continue
 			}
 		}

test/e2e/secret_test.go

@@ -336,6 +336,18 @@ var _ = Describe("Podman secret", func() {
 		Expect(session.OutputToStringArray()).To(HaveLen(1))
 	})
 
+	It("podman secret rm --ignore", func() {
+		remove := podmanTest.Podman([]string{"secret", "rm", "non-existent-secret"})
+		remove.WaitWithDefaultTimeout()
+		Expect(remove).Should(Not(Exit(0)))
+		Expect(remove.ErrorToString()).To(Equal("Error: no secret with name or id \"non-existent-secret\": no such secret"))
+
+		ignoreRm := podmanTest.Podman([]string{"secret", "rm", "--ignore", "non-existent-secret"})
+		ignoreRm.WaitWithDefaultTimeout()
+		Expect(ignoreRm).Should(Exit(0))
+		Expect(ignoreRm.ErrorToString()).To(BeEmpty())
+	})
+
 	It("podman secret creates from environment variable", func() {
 		// no env variable set, should fail
 		session := podmanTest.Podman([]string{"secret", "create", "--env", "a", "MYENVVAR"})