Merge pull request #667 from jterry75/add_windows_generate

Add generate.New support for Windows.

Author: Zhou Hao

Diff for: generate/generate.go

@@ -39,23 +39,43 @@ type ExportOptions struct {
 // New creates a configuration Generator with the default
 // configuration for the target operating system.
 func New(os string) (generator Generator, err error) {
-	if os != "linux" && os != "solaris" {
+	if os != "linux" && os != "solaris" && os != "windows" {
 		return generator, fmt.Errorf("no defaults configured for %s", os)
 	}
 
 	config := rspec.Spec{
-		Version: rspec.Version,
-		Root: &rspec.Root{
+		Version:  rspec.Version,
+		Hostname: "mrsdalloway",
+	}
+
+	if os == "windows" {
+		config.Process = &rspec.Process{
+			Args: []string{
+				"cmd",
+			},
+			Cwd: `C:\`,
+			ConsoleSize: &rspec.Box{
+				Width:  80,
+				Height: 20,
+			},
+		}
+		config.Windows = &rspec.Windows{
+			IgnoreFlushesDuringBoot: true,
+			Network: &rspec.WindowsNetwork{
+				AllowUnqualifiedDNSQuery: true,
+			},
+		}
+	} else {
+		config.Root = &rspec.Root{
 			Path:     "rootfs",
 			Readonly: false,
-		},
-		Process: &rspec.Process{
+		}
+		config.Process = &rspec.Process{
 			Terminal: false,
 			Args: []string{
 				"sh",
 			},
-		},
-		Hostname: "mrsdalloway",
+		}
 	}
 
 	if os == "linux" || os == "solaris" {
@@ -1537,12 +1557,6 @@ func (g *Generator) SetWindowsNetwork(network rspec.WindowsNetwork) {
 	g.Config.Windows.Network = &network
 }
 
-// SetWindowsNetworkNamespace sets g.Config.Windows.Network.NetworkNamespace
-func (g *Generator) SetWindowsNetworkNamespace(path string) {
-	g.initConfigWindows()
-	g.Config.Windows.Network.NetworkNamespace = path
-}
-
 // SetWindowsResourcesCPU sets g.Config.Windows.Resources.CPU.
 func (g *Generator) SetWindowsResourcesCPU(cpu rspec.WindowsCPUResources) {
 	g.initConfigWindowsResources()

Diff for: generate/generate_test.go

@@ -18,42 +18,66 @@ import (
 // and needs to be fixed immediately (as it will break downstreams that depend
 // on us for a "sane default" and do compliance testing -- such as umoci).
 func TestGenerateValid(t *testing.T) {
-	bundle, err := ioutil.TempDir("", "TestGenerateValid_bundle")
-	if err != nil {
-		t.Fatal(err)
+	plat := "linux"
+	if runtime.GOOS == "windows" {
+		plat = "windows"
 	}
-	defer os.RemoveAll(bundle)
 
-	// Create our toy bundle.
-	rootfsPath := filepath.Join(bundle, "rootfs")
-	if err := os.Mkdir(rootfsPath, 0755); err != nil {
-		t.Fatal(err)
-	}
-	configPath := filepath.Join(bundle, "config.json")
-	g, err := generate.New("linux")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := (&g).SaveToFile(configPath, generate.ExportOptions{Seccomp: false}); err != nil {
-		t.Fatal(err)
-	}
+	isolations := []string{"process", "hyperv"}
+	for _, isolation := range isolations {
+		if plat == "linux" && isolation == "hyperv" {
+			// Combination doesn't make sense.
+			continue
+		}
 
-	// Validate the bundle.
-	v, err := validate.NewValidatorFromPath(bundle, true, runtime.GOOS)
-	if err != nil {
-		t.Errorf("unexpected NewValidatorFromPath error: %+v", err)
-	}
-	if err := v.CheckAll(); err != nil {
-		levelErrors, err := specerror.SplitLevel(err, rfc2119.Must)
+		bundle, err := ioutil.TempDir("", "TestGenerateValid_bundle")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.RemoveAll(bundle)
+
+		// Create our toy bundle.
+		rootfsPath := filepath.Join(bundle, "rootfs")
+		if err := os.Mkdir(rootfsPath, 0755); err != nil {
+			t.Fatal(err)
+		}
+		configPath := filepath.Join(bundle, "config.json")
+		g, err := generate.New(plat)
 		if err != nil {
-			t.Errorf("unexpected non-multierror: %+v", err)
-			return
+			t.Fatal(err)
+		}
+		if runtime.GOOS == "windows" {
+			g.AddWindowsLayerFolders("C:\\fakelayer")
+			g.AddWindowsLayerFolders("C:\\fakescratch")
+			if isolation == "process" {
+				// Add the Rootfs section (note: fake volume guid)
+				g.SetRootPath("\\\\?\\Volume{ec84d99e-3f02-11e7-ac6c-00155d7682cf}\\")
+			} else {
+				// Add the Hyper-V section
+				g.SetWindowsHypervUntilityVMPath("")
+			}
+		}
+		if err := (&g).SaveToFile(configPath, generate.ExportOptions{Seccomp: false}); err != nil {
+			t.Fatal(err)
 		}
-		for _, e := range levelErrors.Warnings {
-			t.Logf("unexpected warning: %v", e)
+
+		// Validate the bundle.
+		v, err := validate.NewValidatorFromPath(bundle, true, runtime.GOOS)
+		if err != nil {
+			t.Errorf("unexpected NewValidatorFromPath error: %+v", err)
 		}
-		if err := levelErrors.Error; err != nil {
-			t.Errorf("unexpected MUST error(s): %+v", err)
+		if err := v.CheckAll(); err != nil {
+			levelErrors, err := specerror.SplitLevel(err, rfc2119.Must)
+			if err != nil {
+				t.Errorf("unexpected non-multierror: %+v", err)
+				return
+			}
+			for _, e := range levelErrors.Warnings {
+				t.Logf("unexpected warning: %v", e)
+			}
+			if err := levelErrors.Error; err != nil {
+				t.Errorf("unexpected MUST error(s): %+v", err)
+			}
 		}
 	}
 }

Diff for: validate/validate_test.go

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