Move oci/wclayer to internal for now

John Starks · John Starks · commit eb0cc2575556 · 2018-05-15T16:02:17.000-07:00
We may want to iterate on this interface a bit before we support it
outside of hcsshim.
diff --git a/cmd/wclayer/export.go b/cmd/wclayer/export.go
@@ -8,7 +8,7 @@ import (
 
 	winio "github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/oci/wclayer"
+	"github.com/Microsoft/hcsshim/internal/ociwclayer"
 	"github.com/urfave/cli"
 )
 
@@ -61,6 +61,6 @@ var exportCommand = cli.Command{
 			w = gzip.NewWriter(w)
 		}
 
-		return wclayer.ExportLayer(w, path, layers)
+		return ociwclayer.ExportLayer(w, path, layers)
 	},
 }
diff --git a/cmd/wclayer/import.go b/cmd/wclayer/import.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/oci/wclayer"
+	"github.com/Microsoft/hcsshim/internal/ociwclayer"
 	"github.com/urfave/cli"
 )
 
@@ -56,7 +56,7 @@ var importCommand = cli.Command{
 		if err != nil {
 			return err
 		}
-		_, err = wclayer.ImportLayer(r, path, layers)
+		_, err = ociwclayer.ImportLayer(r, path, layers)
 		return err
 	},
 }
diff --git a/internal/ociwclayer/export.go b/internal/ociwclayer/export.go
@@ -1,6 +1,6 @@
-// Package wclayer provides functions for importing and exporting Windows
+// Package ociwclayer provides functions for importing and exporting Windows
 // container layers from and to their OCI tar representation.
-package wclayer
+package ociwclayer
 
 import (
 	"io"
diff --git a/internal/ociwclayer/import.go b/internal/ociwclayer/import.go
@@ -1,4 +1,4 @@
-package wclayer
+package ociwclayer
 
 import (
 	"bufio"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`winio "github.com/Microsoft/go-winio"`
`10`	`10`	`"github.com/Microsoft/hcsshim/internal/appargs"`
`11`		`- "github.com/Microsoft/hcsshim/oci/wclayer"`
	`11`	`+ "github.com/Microsoft/hcsshim/internal/ociwclayer"`
`12`	`12`	`"github.com/urfave/cli"`
`13`	`13`	`)`
`14`	`14`
`@@ -61,6 +61,6 @@ var exportCommand = cli.Command{`
`61`	`61`	`w = gzip.NewWriter(w)`
`62`	`62`	`}`
`63`	`63`
`64`		`- return wclayer.ExportLayer(w, path, layers)`
	`64`	`+ return ociwclayer.ExportLayer(w, path, layers)`
`65`	`65`	`},`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/Microsoft/go-winio"`
`11`	`11`	`"github.com/Microsoft/hcsshim/internal/appargs"`
`12`		`- "github.com/Microsoft/hcsshim/oci/wclayer"`
	`12`	`+ "github.com/Microsoft/hcsshim/internal/ociwclayer"`
`13`	`13`	`"github.com/urfave/cli"`
`14`	`14`	`)`
`15`	`15`
`@@ -56,7 +56,7 @@ var importCommand = cli.Command{`
`56`	`56`	`if err != nil {`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`		`- _, err = wclayer.ImportLayer(r, path, layers)`
	`59`	`+ _, err = ociwclayer.ImportLayer(r, path, layers)`
`60`	`60`	`return err`
`61`	`61`	`},`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package wclayer`
	`1`	`+package ociwclayer`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bufio"`