Several tiny fixes

Signed-off-by: Haiyan Meng <hmeng@redhat.com>

Author: Haiyan Meng

cmd/ocitools/generate.go

@@ -321,7 +321,7 @@ func setupSpec(g generate.Generator, context *cli.Context) error {
 	}
 
 	// Set the DefaultAction of seccomp
-	if context.IsSet("setcomp-default") {
+	if context.IsSet("seccomp-default") {
 		if err := g.SetLinuxSeccompDefault(sd); err != nil {
 			return err
 		}
@@ -345,7 +345,7 @@ func setupSpec(g generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	if context.IsSet("seccomp-allows") {
+	if context.IsSet("seccomp-allow") {
 		seccompAllows := context.StringSlice("seccomp-allow")
 		for _, s := range seccompAllows {
 			g.AddLinuxSeccompSyscallAllow(s)

generate/generate.go

@@ -237,7 +237,7 @@ func (g Generator) AddAnnotation(s string) error {
 
 	pair := strings.Split(s, "=")
 	if len(pair) != 2 {
-		return fmt.Errorf("incorrectly specified sysctl: %s", s)
+		return fmt.Errorf("incorrectly specified annotation: %s", s)
 	}
 	g.spec.Annotations[pair[0]] = pair[1]
 	return nil
@@ -855,10 +855,10 @@ func (g Generator) SetupPrivileged(privileged bool) {
 
 func checkCap(c string) error {
 	isValid := false
-	cp := fmt.Sprintf("CAP_%s", c)
+	cp := strings.ToUpper(c)
 
 	for _, cap := range capability.List() {
-		if strings.ToUpper(cp) == strings.ToUpper(cap.String()) {
+		if cp == strings.ToUpper(cap.String()) {
 			isValid = true
 			break
 		}
@@ -881,10 +881,10 @@ func (g Generator) AddProcessCapability(c string) error {
 		return err
 	}
 
-	cp := fmt.Sprintf("CAP_%s", c)
+	cp := fmt.Sprintf("CAP_%s", strings.ToUpper(c))
 
 	for _, cap := range g.spec.Process.Capabilities {
-		if strings.ToUpper(cap) == strings.ToUpper(cp) {
+		if strings.ToUpper(cap) == cp {
 			return nil
 		}
 	}
@@ -899,10 +899,10 @@ func (g Generator) DropProcessCapability(c string) error {
 		return err
 	}
 
-	cp := fmt.Sprintf("CAP_%s", c)
+	cp := fmt.Sprintf("CAP_%s", strings.ToUpper(c))
 
 	for i, cap := range g.spec.Process.Capabilities {
-		if strings.ToUpper(cap) == strings.ToUpper(cp) {
+		if strings.ToUpper(cap) == cp {
 			g.spec.Process.Capabilities = append(g.spec.Process.Capabilities[:i], g.spec.Process.Capabilities[i+1:]...)
 			return nil
 		}