generate: fix type for Umask

umask is a pointer to an uint32. The error was first present in the runtime-specs Go bindings and it was fixed with: opencontainers/runtime-spec#1058 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
giuseppe · Jan 15, 2021 · 1d051e9 · 1d051e9
1 parent db8c0f0
commit 1d051e9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 24 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/generate/generate.go b/generate/generate.go
@@ -447,7 +447,8 @@ func (g *Generator) SetProcessUsername(username string) {
 // SetProcessUmask sets g.Config.Process.User.Umask.
 func (g *Generator) SetProcessUmask(umask uint32) {
 	g.initConfigProcess()
-	g.Config.Process.User.Umask = umask
+	u := umask
+	g.Config.Process.User.Umask = &u
 }
 
 // SetProcessGID sets g.Config.Process.User.GID.

diff --git a/validation/util/test.go b/validation/util/test.go
@@ -52,11 +52,11 @@ const (
 	LifecycleStatusStopped
 )
 
-var lifecycleStatusMap = map[string]LifecycleStatus{
-	"creating": LifecycleStatusCreating,
-	"created":  LifecycleStatusCreated,
-	"running":  LifecycleStatusRunning,
-	"stopped":  LifecycleStatusStopped,
+var lifecycleStatusMap = map[rspec.ContainerState]LifecycleStatus{
+	rspec.StateCreating: LifecycleStatusCreating,
+	rspec.StateCreated:  LifecycleStatusCreated,
+	rspec.StateRunning:  LifecycleStatusRunning,
+	rspec.StateStopped:  LifecycleStatusStopped,
 }
 
 // LifecycleConfig includes

diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go
diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go