generate: fix type for Umask

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.

validate/validate.go

@@ -144,7 +144,7 @@ func JSONSchemaURL(version string) (url string, err error) {
 func (v *Validator) CheckJSONSchema() (errs error) {
 	logrus.Debugf("check JSON schema")
 
-	url, err := JSONSchemaURL(v.spec.Version)
+	url, err := JSONSchemaURL(strings.TrimSuffix(v.spec.Version, "-dev"))
 	if err != nil {
 		errs = multierror.Append(errs, err)
 		return errs

validate/validate_test.go

@@ -43,7 +43,7 @@ func TestJSONSchema(t *testing.T) {
 	}{
 		{
 			config: &rspec.Spec{},
-			error:  "1 error occurred:\n\t* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v1.0.2/config.md#specification-version\n\n",
+			error:  fmt.Sprintf("1 error occurred:\n\t* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v%s/config.md#specification-version\n\n", rspec.Version),
 		},
 		{
 			config: &rspec.Spec{

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